Merge branch 'main' into feat/seats

apps/docs/guides/self-hosting/introduction.mdx

@@ -1,140 +0,0 @@
----
-title: "Introduction"
-description: "Overview and quick start to run Kan on your own infrastructure using Docker Compose."
-mode: "wide"
-tag: "NEW"
----
-
-This guide introduces how to self-host Kan. It starts with the minimal Docker Compose setup (web + PostgreSQL) and points you to optional features like email and S3-based file storage.
-
-## What you’ll set up
-
-<CardGroup cols={2}>
-  <Card title="Kan" icon="globe" color="#0284c7" horizontal>
-    Next.js application served on port 3000.
-  </Card>
-  <Card title="PostgreSQL 15" icon="database" color="#65a30d" horizontal>
-    Primary database for Kan data.
-  </Card>
-</CardGroup>
-
-<Note>
-  For file uploads (avatars), OAuth, and other advanced options, see the
-  Environment Variables section in the README and the dedicated [S3
-  guide](/guides/self-hosting/s3). The [full
-  compose](https://github.com/kanbn/kan/blob/main/docker-compose.yml) in the
-  repo includes a richer configuration via <code>.env</code>.
-</Note>
-
-## Prerequisites
-
-- Docker and Docker Compose
-- A long random string for <code>BETTER_AUTH_SECRET</code> (32+ chars)
-
-## Quick start
-
-<Steps>
-  <Step title="Create a docker-compose.yml">
-    Paste the following minimal configuration into a new <code>docker-compose.yml</code> file:
-
-    ```yaml
-    services:
-      web:
-        image: ghcr.io/kanbn/kan:latest
-        container_name: kan-web
-        ports:
-          - "3000:3000"
-        networks:
-          - kan-network
-        environment:
-          NEXT_PUBLIC_BASE_URL: http://localhost:3000
-          BETTER_AUTH_SECRET: your_auth_secret
-          POSTGRES_URL: postgresql://kan:your_postgres_password@postgres:5432/kan_db
-          NEXT_PUBLIC_ALLOW_CREDENTIALS: true
-        depends_on:
-          - postgres
-        restart: unless-stopped
-
-      postgres:
-        image: postgres:15
-        container_name: kan-db
-        environment:
-          POSTGRES_DB: kan_db
-          POSTGRES_USER: kan
-          POSTGRES_PASSWORD: your_postgres_password
-        ports:
-          - 5432:5432
-        volumes:
-          - kan_postgres_data:/var/lib/postgresql/data
-        restart: unless-stopped
-        networks:
-          - kan-network
-
-    networks:
-      kan-network:
-
-    volumes:
-      kan_postgres_data:
-    ```
-
-    <Tip>
-      The example above is intentionally minimal. The repository provides a more feature-complete compose file at [docker-compose.yml](https://github.com/kanbn/kan/blob/main/docker-compose.yml) if you want environment-based configuration, OAuth, S3, and more.
-    </Tip>
-
-  </Step>
-
-  <Step title="Start the stack">
-    Bring everything up in detached mode:
-
-    ```bash
-    docker compose up -d
-    ```
-
-    Once started, open [http://localhost:3000](http://localhost:3000).
-
-  </Step>
-
-  <Step title="Manage the containers">
-    Useful commands while developing or testing:
-
-    - Stop the containers: <code>docker compose down</code>
-    - View logs: <code>docker compose logs -f</code>
-    - Restart: <code>docker compose restart</code>
-
-  </Step>
-
-  <Step title="Configure environment (optional)">
-    For a production-like setup and more features (email, OAuth, file uploads, etc.), create a <code>.env</code> file and set the relevant variables shown in the README’s Environment Variables section.
-
-    <Accordion title="Common variables">
-      ```bash
-      # Required
-      NEXT_PUBLIC_BASE_URL=http://localhost:3000
-      BETTER_AUTH_SECRET=replace_with_long_random_string
-      POSTGRES_URL=postgresql://kan:your_postgres_password@postgres:5432/kan_db
-
-      # Optional: Email
-      EMAIL_FROM="Kan <hello@mail.kan.bn>"
-      SMTP_HOST=smtp.resend.com
-      SMTP_PORT=465
-      SMTP_USER=resend
-      SMTP_PASSWORD=re_xxxx
-      SMTP_SECURE=true
-
-      # Optional: Auth toggles
-      NEXT_PUBLIC_ALLOW_CREDENTIALS=true
-      NEXT_PUBLIC_DISABLE_SIGN_UP=false
-      ```
-
-      <Note type="warning">
-        If you plan to enable file uploads (avatars, etc.), you’ll also need S3 variables (<code>S3_ENDPOINT</code>, <code>S3_ACCESS_KEY_ID</code>, <code>S3_SECRET_ACCESS_KEY</code>, <code>NEXT_PUBLIC_STORAGE_URL</code>, <code>NEXT_PUBLIC_STORAGE_DOMAIN</code>, …). See the S3 guide linked at the top.
-      </Note>
-    </Accordion>
-
-  </Step>
-</Steps>
-
-## Reference
-
-- [GitHub README](https://github.com/kanbn/kan/blob/main/README.md#self-hosting-)
-- [GitHub docker-compose.yml](https://github.com/kanbn/kan/blob/main/docker-compose.yml)

apps/docs/guides/self-hosting/s3.mdx

@@ -1,397 +0,0 @@
----
-title: "Kan + MinIO (S3)"
-mode: "wide"
-tag: "NEW"
----
-
-Deploy Kan with PostgreSQL and MinIO (S3-compatible storage) using Docker Compose, with clear steps and production notes.
-
-## What you’ll set up
-
-<CardGroup cols={2}>
-  <Card title="Kan" icon="globe" color="#0284c7" horizontal>
-    Kan web app (Next.js), on port 3000.
-  </Card>
-  <Card title="PostgreSQL 15" icon="database" color="#65a30d" horizontal>
-    PostgreSQL database for Kan.
-  </Card>
-</CardGroup>
-<Card title="MinIO (S3-compatible)" icon="cloud" color="#ca8a04" horizontal>
-  MinIO object storage (console port 9001, S3 API port 9000).
-</Card>
-
-## How it works
-
-- Kan stores data in PostgreSQL.
-- Kan uploads files (e.g., avatars) to MinIO over the S3 API.
-- The browser fetches public files directly from MinIO’s public URL.
-- The Next.js image optimizer in Kan must be explicitly allowed to fetch from your storage host.
-
-Key domain settings:
-
-- <code>NEXT_PUBLIC_BASE_URL</code> → the Kan site
-- <code>NEXT_PUBLIC_STORAGE_URL</code> → the public S3 base URL
-- <code>NEXT_PUBLIC_STORAGE_DOMAIN</code> → the exact S3 hostname (no scheme)
-
-## Prerequisites
-
-- Docker and Docker Compose
-- Open local ports: 3000 (Kan), 5432 (Postgres), 9000/9001 (MinIO)
-- A long random string for <code>BETTER_AUTH_SECRET</code> (32+ chars)
-
-<Note type="warning">
-  For production you’ll want a reverse proxy (Traefik/Nginx/Caddy), valid TLS
-  certificates, and DNS for your domains (e.g., <code>kan.example.com</code>,{" "}
-  <code>s3.example.com</code>).
-</Note>
-
-## Quick start
-
-<Tip type="info">
-  Why <code>localtest.me</code>? It resolves to <code>127.0.0.1</code>{" "}
-  automatically, so you can test domain-based configs locally without editing
-  hosts.
-</Tip>
-
-<Steps>
-  <Step title="Set environment variables">
-    Provide the minimum required configuration (local example):
-
-    ```bash
-    NEXT_PUBLIC_BASE_URL=http://kan.localtest.me:3000
-    BETTER_AUTH_SECRET=<long random string>
-    POSTGRES_URL=postgresql://kan:<password>@postgres:5432/kan_db
-
-    # MinIO/S3
-    S3_ENDPOINT=http://s3.localtest.me:9000
-    S3_ACCESS_KEY_ID=<minio-access-key>
-    S3_SECRET_ACCESS_KEY=<minio-secret-key>
-    S3_REGION=none
-    S3_FORCE_PATH_STYLE=true
-
-    # Public storage access
-    NEXT_PUBLIC_STORAGE_URL=http://s3.localtest.me:9000
-    NEXT_PUBLIC_STORAGE_DOMAIN=s3.localtest.me
-    NEXT_PUBLIC_AVATAR_BUCKET_NAME=kan
-    ```
-
-    <Note type="info">
-      Issue #109 fix: make sure <code>NEXT_PUBLIC_STORAGE_DOMAIN</code> exactly
-      equals the hostname that serves your images (no scheme, no port).
-    </Note>
-
-    Optional (see README for full list): Email (`EMAIL_FROM`, `SMTP_HOST`, `SMTP_PORT`, `SMTP_USER`, `SMTP_PASSWORD`, `SMTP_SECURE`), OAuth/OIDC (`GOOGLE_*`, `GITHUB_*`, `OIDC_*`), auth toggles, Trello import, etc.
-
-  </Step>
-
-  <Step title="Create or review Docker Compose files">
-    You can start from the minimal compose at the repository root (<code>docker-compose.yml</code>) and review the production-oriented settings in <code>cloud/docker-compose.yml</code>.
-
-    Start with the minimal setup (web + postgres + minio) and ensure environment variables are passed to the web service.
-
-    <Accordion title="Docker Compose example">
-
-    ```yaml
-    services:
-      postgres:
-        image: postgres:15
-        container_name: kan-db
-        ports:
-          - "5432:5432"
-        environment:
-          POSTGRES_USER: kan
-          POSTGRES_PASSWORD: changeme
-          POSTGRES_DB: kan_db
-        volumes:
-          - pg_data:/var/lib/postgresql/data
-        restart: unless-stopped
-
-      minio:
-        image: minio/minio:latest
-        container_name: kan-minio
-        command: server /data --console-address ":9001"
-        ports:
-          - "9000:9000" # S3 API
-          - "9001:9001" # Console
-        environment:
-          # Use the same credentials in your .env
-          # as S3_ACCESS_KEY_ID / S3_SECRET_ACCESS_KEY
-          MINIO_ROOT_USER: minio
-          MINIO_ROOT_PASSWORD: minio123456789
-        volumes:
-          - minio_data:/data
-        restart: unless-stopped
-
-      web:
-        image: ghcr.io/kanbn/kan:latest
-        container_name: kan-web
-        depends_on:
-          - postgres
-          - minio
-        ports:
-          - "3000:3000"
-        # Load variables from .env
-        # (see the "Set environment variables" step)
-        env_file:
-          - .env
-        restart: unless-stopped
-
-    volumes:
-      pg_data:
-      minio_data:
-    ```
-
-    <Note type="info">
-      Ensure your <code>.env</code> contains values that match this compose file.
-      For example:
-      <ul>
-        <li>
-          <code>POSTGRES_URL=postgresql://kan:changeme@postgres:5432/kan_db</code>
-        </li>
-        <li>
-          <code>S3_ENDPOINT=http://s3.localtest.me:9000</code>
-        </li>
-        <li>
-          <code>S3_ACCESS_KEY_ID=minio</code> and{" "}
-          <code>S3_SECRET_ACCESS_KEY=minio123456789</code>
-        </li>
-        <li>
-          <code>S3_FORCE_PATH_STYLE=true</code>
-        </li>
-        <li>
-          <code>NEXT_PUBLIC_STORAGE_URL=http://s3.localtest.me:9000</code>
-        </li>
-        <li>
-          <code>NEXT_PUBLIC_STORAGE_DOMAIN=s3.localtest.me</code>
-        </li>
-        <li>
-          <code>NEXT_PUBLIC_AVATAR_BUCKET_NAME=kan</code>
-        </li>
-      </ul>
-    </Note>
-
-    </Accordion>
-
-  </Step>
-
-  <Step title="Start services">
-
-    ```bash
-    docker compose up -d
-    ```
-
-    Then open:
-
-    <ul>
-      <li>
-        Kan: <a href="http://kan.localtest.me:3000">http://kan.localtest.me:3000</a>
-      </li>
-      <li>
-        MinIO Console:{" "}
-        <a href="http://minio.localtest.me:9001">http://minio.localtest.me:9001</a>
-      </li>
-      <li>
-        MinIO S3 API:{" "}
-        <a href="http://s3.localtest.me:9000">http://s3.localtest.me:9000</a>
-      </li>
-    </ul>
-
-  </Step>
-
-  <Step title="Initialize MinIO">
-    1) Log into the MinIO Console (http://minio.localtest.me:9001).
-
-    2. Create a bucket (e.g., <code>kan</code>).
-
-    3. For simple public avatars, apply a read-only policy so GET requests are allowed for objects:
-
-    ```json
-    {
-      "Version": "2012-10-17",
-      "Statement": [
-        {
-          "Effect": "Allow",
-          "Principal": { "AWS": ["*"] },
-          "Action": ["s3:GetBucketLocation", "s3:ListBucket"],
-          "Resource": ["arn:aws:s3:::kan"]
-        },
-        {
-          "Effect": "Allow",
-          "Principal": { "AWS": ["*"] },
-          "Action": ["s3:GetObject"],
-          "Resource": ["arn:aws:s3:::kan/*"]
-        }
-      ]
-    }
-    ```
-
-    <Note type="warning">
-      Alternatively, keep the bucket private and use presigned URLs. In that case,
-      ensure your server and browser access paths are correctly configured.
-    </Note>
-
-  </Step>
-
-  <Step title="Verify the setup">
-    <ul>
-      <li>Sign in to Kan and upload an avatar (Settings).</li>
-      <li>Confirm the object is created in your MinIO bucket.</li>
-      <li>The avatar should render without errors.</li>
-    </ul>
-
-    If you see a 400 from <code>/\_next/image</code> with “url parameter is not allowed”:
-
-    <ul>
-      <li>
-        <code>NEXT_PUBLIC_STORAGE_DOMAIN</code> must exactly match the S3 hostname
-        that serves images.
-      </li>
-      <li>
-        <code>NEXT_PUBLIC_STORAGE_URL</code> should use the same host (with
-        scheme/port).
-      </li>
-      <li>Ensure you’re using the latest Kan image.</li>
-    </ul>
-
-  </Step>
-</Steps>
-
-## Production setup
-
-<Tabs>
-  <Tab title="Local">
-
-  <ul>
-    <li><code>NEXT_PUBLIC_BASE_URL=http://kan.localtest.me:3000</code></li>
-    <li><code>S3_ENDPOINT=http://s3.localtest.me:9000</code></li>
-    <li><code>NEXT_PUBLIC_STORAGE_URL=http://s3.localtest.me:9000</code></li>
-    <li><code>NEXT_PUBLIC_STORAGE_DOMAIN=s3.localtest.me</code></li>
-    <li>Keep <code>S3_FORCE_PATH_STYLE=true</code> for MinIO.</li>
-  </ul>
-  </Tab>
-  <Tab title="Production">
-
-  <ul>
-    <li><code>NEXT_PUBLIC_BASE_URL=https://kan.example.com</code></li>
-    <li><code>S3_ENDPOINT=https://s3.example.com</code></li>
-    <li><code>NEXT_PUBLIC_STORAGE_URL=https://s3.example.com</code></li>
-    <li><code>NEXT_PUBLIC_STORAGE_DOMAIN=s3.example.com</code></li>
-    <li>Keep <code>S3_FORCE_PATH_STYLE=true</code> for MinIO.</li>
-    <li>Put Kan and MinIO behind HTTPS with a reverse proxy (Traefik/Nginx) and valid TLS.</li>
-  </ul>
-  </Tab>
-</Tabs>
-
-## Troubleshooting
-
-<AccordionGroup>
-  <Accordion title="Files upload but don’t display">
-    <ul>
-      <li>If public: confirm GET is allowed on objects (bucket policy).</li>
-      <li>If private: ensure presigned URLs are generated and valid.</li>
-      <li>403 AccessDenied indicates permissions, not CORS. CORS is not required for simple <code>&lt;img&gt;</code> GETs.</li>
-    </ul>
-  </Accordion>
-
-  <Accordion title="Make the bucket public (read-only) with mc" defaultOpen>
-    Use your MinIO root credentials to allow anonymous reads:
-
-    ```bash
-    # Replace with your MINIO_ROOT_PASSWORD
-    MINIO_PASS='<your-minio-password>'
-
-    # Point mc at MinIO via the container network (no ports required)
-    docker run --rm --network container:kan-minio minio/mc \
-      mc alias set local http://127.0.0.1:9000 minio "$MINIO_PASS"
-
-    # Allow public downloads from the bucket
-    docker run --rm --network container:kan-minio minio/mc \
-      mc anonymous set download local/kan
-
-    # Optional: verify anonymous status
-    docker run --rm --network container:kan-minio minio/mc \
-      mc anonymous get local/kan
-    ```
-
-  </Accordion>
-
-  <Accordion title="Alternative: S3 bucket policy (AWS CLI)">
-    If you prefer a bucket policy, apply a public-read policy for objects:
-
-    ```json policy.json
-    {
-      "Version": "2012-10-17",
-      "Statement": [
-        {
-          "Sid": "PublicReadGetObject",
-          "Effect": "Allow",
-          "Principal": "*",
-          "Action": ["s3:GetObject"],
-          "Resource": ["arn:aws:s3:::kan/*"]
-        }
-      ]
-    }
-    ```
-
-    ```bash
-    # Use your MinIO root credentials
-    MINIO_PASS='<your-minio-password>'
-
-    docker run --rm --network container:kan-minio \
-      -e AWS_ACCESS_KEY_ID=minio \
-      -e AWS_SECRET_ACCESS_KEY="$MINIO_PASS" \
-      -e AWS_DEFAULT_REGION=us-east-1 -e AWS_S3_FORCE_PATH_STYLE=true \
-      -v "$PWD:/work" amazon/aws-cli \
-      s3api put-bucket-policy --bucket kan --policy file:///work/policy.json \
-      --endpoint-url http://127.0.0.1:9000
-    ```
-
-  </Accordion>
-
-<Accordion title="Next.js optimizer 400 — url parameter is not allowed">
-  <ul>
-    <li>
-      Exact match on <code>NEXT_PUBLIC_STORAGE_DOMAIN</code> with your storage
-      host.
-    </li>
-    <li>
-      Same host in <code>NEXT_PUBLIC_STORAGE_URL</code>.
-    </li>
-    <li>Update to the latest Kan image.</li>
-  </ul>
-</Accordion>
-
-  <Accordion title="Next/Image: “url parameter is valid but upstream response is invalid”">
-    <ul>
-      <li>This means Next.js accepted the URL, but the upstream returned a non-image (e.g., 403 HTML/XML).</li>
-      <li>Fix: make the bucket/object publicly readable (see above), or use presigned URLs.</li>
-      <li>Sanity test from the web network (replace with your image URL):</li>
-    </ul>
-
-    ```bash
-    IMG_URL="https://s3.example.com/kan/path/to/avatar.jpg"
-
-    # Headers/content-type as seen from the app network
-    docker run --rm --network container:kan-web curlimages/curl:8.9.1 \
-      -I -L --max-redirs 5 "$IMG_URL"
-
-    # Quick status + content-type summary
-    docker run --rm --network container:kan-web curlimages/curl:8.9.1 \
-      -s -o /dev/null -w "HTTP:%{http_code} CT:%{content_type} URL:%{url_effective}\n" -L "$IMG_URL"
-    ```
-
-  </Accordion>
-
-  <Accordion title="Connectivity checks">
-    <ul>
-      <li>The Kan container must reach <code>S3_ENDPOINT</code>.</li>
-      <li>Verify DNS/ports inside the container (e.g., <code>docker exec -it &lt;kan-container&gt; sh</code>).</li>
-    </ul>
-  </Accordion>
-</AccordionGroup>
-
-## References
-
-- [Kan README](https://github.com/kanbn/kan/blob/main/README.md)
-- [Cloud compose reference](https://github.com/kanbn/kan/blob/main/cloud/docker-compose.yml)
-- [Kan #109 Issue](https://github.com/kanbn/kan/issues/109)

apps/docs/mint.json

@@ -44,18 +44,6 @@
       "group": "Get Started",
       "pages": ["introduction"]
     },
-    {
-      "group": "Guides",
-      "pages": [
-        {
-          "group": "Self-Hosting",
-          "pages": [
-            "guides/self-hosting/introduction",
-            "guides/self-hosting/s3"
-          ]
-        }
-      ]
-    },
     {
       "group": "Import",
       "pages": ["imports/trello"]

apps/web/i18n.json

@@ -2,7 +2,7 @@
   "version": 0,
   "locale": {
     "source": "en",
-    "targets": ["fr", "de", "es", "it", "nl", "ru"]
+    "targets": ["fr", "de", "es", "it", "nl"]
   },
   "buckets": {
     "po": {

apps/web/i18n.lock

@@ -10,7 +10,6 @@ checksums:
     "%248%2Fmonth/singular": 4667034934bb2bc3d569c70b94205b51
     1%20user/singular: 3b547431ab12f0fba84307e6a81109d8
     A%20powerful%2C%20flexible%20kanban%20app%20that%20helps%20you%20organise%20work%2C%20track%20progress%2C%20and%20deliver%20results%E2%80%94all%20in%20one%20place./singular: d405b83b0d631cb72f4347c10bcbb643
-    Account/singular: 01215c12fb1cdb93bd0c84c1382bef56
     Account%20deleted/singular: a25da96a1579c4491be0a95669ef18a4
     Activity/singular: 1948763de8e531483a798b68195e297e
     Activity%20logs/singular: 8b1f0bb96a905646ecfad1cfdfa42168
@@ -30,17 +29,11 @@ checksums:
     added%20checklist%20item%20%3C0%3E%7B0%7D%3C%2F0%3E/singular: bdd202da20b1fffbec21792c5453f90c
     added%20label%20%3C0%3E%7B0%7D%3C%2F0%3E/singular: b32be052b3d57de0c9120fa7f9fc86ee
     Adding%20a%20new%20member%20will%20cost%20an%20additional%20%7Bprice%7D%20(%7BbillingType%7D)%20per%20seat./singular: 12e88573028306110fbc15ef1e714892
-    Adjust%20the%20square%20crop%20to%20fit%20your%20avatar./singular: a4df26bbce6f14c6962fac1324db00a8
     Admin%20roles/singular: 32a5d78073b9bb9a246773afba8831df
     All%20systems%20operational/singular: ee943a4046b09e6334cceeea9fda2bfc
     Already%20have%20an%20account%3F%20%3C0%3E%3C1%3ESign%20in%3C%2F1%3E%3C%2F0%3E/singular: 2959fd276248208b65cb27ed46b20135
     An%20error%20occurred%20while%20disconnecting%20your%20Trello%20account./singular: 0aa3973b860c1faf8d9123aebf567e40
     An%20unexpected%20error%20occurred.%20Please%20try%20again%20later./singular: 1b5749b0cca6a62d75a577bee6804074
-    API/singular: 01d9819514e27056dcc69463194b63d2
-    API%20key%20created/singular: 8dbb2b60a719b0d120e774d6666c8c45
-    API%20key%20name/singular: 2d8aeb08b2cce3b750a584bbc5ce6d1d
-    API%20key%20name%20cannot%20exceed%2030%20characters/singular: 3ea1c7d68e1074a75128017b097b727a
-    API%20key%20name%20is%20required/singular: 870970743b14cb56e7fb7b410af0e933
     API%20keys/singular: 07f3620a30e08136f0b072c9af8d1eef
     API%20Reference/singular: 7dcc877064bfdf889ec55dbc9e06a242
     Applicants/singular: 4babd8331a1441e91087f855f43e57f8
@@ -62,7 +55,6 @@ checksums:
     Billing%20portal/singular: dc3afa14ffe19f5920992a0c9d49d525
     Blog%20Post/singular: 38e027f212be445dc530e427fc642a20
     Board/singular: 101ff39aab674c033c15ab978d0d8bac
-    Board%20analytics/singular: 336a8c70a91adc49c15266167ee84cc0
     Board%20name%20cannot%20exceed%20100%20characters/singular: 985c0177744ec56d8dac84f66ec284ca
     Board%20name%20is%20required/singular: dbd0c6cc945ab19e702fc27f970a023b
     Board%20not%20found/singular: 5af9844595fa8aed5985066620435515
@@ -81,12 +73,11 @@ checksums:
     Card%20not%20found/singular: 91509e2f92b0b3b11330b6983139fdbf
     Card%20title/singular: 7c34f59f4005e6cb3a6ff546ea0b96e3
     Change%20Password/singular: a552fc5c4189ebc3e2e6018edda7d18f
-    Change%20your%20language%20preferences./singular: 293d49fc3c75e9c425b64bd7126e6b46
+    Change%20the%20language%20of%20the%20app./singular: fb20db145e28ed44aba89c146ded7bfc
     Check%20your%20inbox/singular: e9a430fcd298def74212238df0f680d6
     Checklist%20name/singular: 5eb5de823f7ca5a4d97bb41e6a3f675a
     Clear%20filters/singular: 8f40ab5af527e4b190da94e7b6221379
     Click%20on%20the%20link%20we've%20sent%20to%20%7BmagicLinkRecipient%7D%20to%20sign%20in./singular: 210b6ff8727f976182ec3f29ea3c7667
-    Close/singular: 2c2e22f8424a1031de89063bd0022e16
     Code%20Review/singular: a2da6c2339301e7c3ddf068c4ff9f7e8
     Collaborate%20seamlessly%20with%20your%20team./singular: c5f10e431aaf8b51519bc009a4a4080c
     Coming%20soon/singular: ee2b0671e00972773210c5be5a9ccb89
@@ -96,6 +87,7 @@ checksums:
     Complete%20control%20and%20ownership%3A/singular: 0d8b682ba873272217425ccfc96aa9cd
     completed%20a%20checklist%20item/singular: 757b04c6c80cc927e1c597c0ad4fda33
     completed%20checklist%20item%20%3C0%3E%7B0%7D%3C%2F0%3E/singular: 71ec18acf051fc909a48a07ca3578673
+    Confirm%20URL%20change/singular: e14b4ce081d1ef6194b37e1814e97b39
     Confirm%20your%20new%20password/singular: a0d2935d7b63f8dd19d7c0de47524416
     Connect%20Trello/singular: 4440a0b9e387ef7136e3958e7a089213
     Connect%20your%20favorite%20tools%20to%20streamline%20your%20workflow./singular: 033c5dcdb059ccb634aef7fe63f2f45d
@@ -107,7 +99,6 @@ checksums:
     Continue%20with%20%7B0%7D/singular: 2eaf6e1da91e208f7c5fb6bf862fe8a6
     Control%20who%20can%20view%20and%20edit%20your%20boards./singular: 2a7e0bec29bac26280de707e2fe8bce5
     Create%20another/singular: 2de8a82a416eb78c0462aa36278edc9a
-    Create%20API%20key/singular: 70ed8431c6ed5f7fdef122cc34f75b41
     Create%20board/singular: 155b62818bfab0e34f0089e1b34a32f3
     Create%20card/singular: 32792935dd5837a9433909b04021c22b
     Create%20checklist/singular: 5cbca15a7004558c4e6d381f83a34da2
@@ -120,11 +111,9 @@ checksums:
     Create%20workspace/singular: 2e6718e79964ea5ce22d76c2189c77ca
     created%20the%20card/singular: 605475f5aaeb4dbccbf7c4eb9107b43d
     Critical/singular: eb327cd411b50aee954f8d1d215d003a
-    Crop%20your%20avatar/singular: eb25e2d5972ec36a0b40481c8136ab15
     Current%20password%20is%20required/singular: 72536bca9598680027f2be8ce80ac280
     Custom%20domain/singular: b09e7a9c187b7163b4a6cfc78042fe42
-    Custom%20URLs%20require%20upgrading%20to%20a%20Pro%20plan/singular: f7275e3b473b8f7b39dab6b37eb26fea
-    Custom%20workspace%20URL/singular: 7ba841d0946eb04fa3d17d74365be37b
+    Custom%20URLs%20are%20a%20premium%20feature.%20You'll%20be%20directed%20to%20upgrade%20your%20account./singular: b52e4f6122cf739c9551d29beb89b25e
     Customer%20Support/singular: 50e3c77e22e41061ca85ea2f02625a2e
     Dark/singular: 73e6e208ba628b26e90fcf6dce15e1b2
     Delete/singular: 8bcf303dd10a645b5baacb02b47d72c9
@@ -177,7 +166,6 @@ checksums:
     Error%20updating%20workspace%20name/singular: 46025f42a7d5eff689e9cb8bed14a1e4
     Error%20updating%20workspace%20URL/singular: 9da6c012e1b512d8c7fbd812626c4675
     Error%20upgrading%20subscription/singular: 57cc47581c7faaffb3b1721b6352b576
-    Error%20upgrading%20to%20Pro/singular: 934c6867d9bdbe6099b2c0f5a3107f78
     Error%20uploading%20profile%20image/singular: 0ba02753a797a74c6ea7b622c9f69c71
     Everything%20in%20the%20free%20plan%2C%20plus%3A/singular: 62b44c4973b92b806c69a4b15e0256dc
     Everything%20you%20need%2C%20free%20forever.%20Unlimited%20boards%2C%20unlimited%20lists%2C%20unlimited%20cards.%20Upgrade%20any%20time./singular: fa21632ab1468edf10acda2fe7b71323
@@ -242,9 +230,6 @@ checksums:
     Labels/singular: 6f15627a90002323eac018274b6922d6
     Labels%20%26%20Filters/singular: 8f0bdd6084516f8241cb613178114390
     Language/singular: 277fd1a41cc237a437cd1d5e4a80463b
-    Launch%20offer/singular: 624592ba2ecf647a3fe60d493c1ee71a
-    Launch%20offer%3A%20Get%20unlimited%20members%20with%20Pro/singular: 8c1be80f5b2fcc112922282afbe30287
-    Launch%20offer%3A%20unlimited%20seats%20for%20just%20%2429%2Fmonth%20with%20Pro/singular: 235d1cda21811c296afdc0dcc438cc24
     Learning/singular: 90e91da3f870f065f2da9aa9adf53514
     Legal/singular: 00d3f08da61a21887009819cf93fb414
     License/singular: ac2bcac75151e2fcd9eb768cea275a77
@@ -269,7 +254,6 @@ checksums:
     Name/singular: 9368b5a047572b6051f334af5aa76819
     Need%20help%3F/singular: 04e7322f2d3ffb2d73ff2f64b71637c8
     New/singular: 126d036fae5fb6b629728ecb97e6195b
-    New%20API%20key/singular: db3088aedba6e4a99b46451c5b3d36ed
     New%20board/singular: 63f4e979e29a7fc2f5c09ff91fa75966
     New%20card/singular: a33f6219a756127f91c2523cfe845a19
     New%20checklist/singular: 58252b71e9693ae0f4d2d0b72108a569
@@ -297,7 +281,6 @@ checksums:
     Password%20Changed/singular: 1fcebe9ddb46f722a57f195efddc695d
     Password%20must%20be%20at%20least%208%20characters/singular: 4c30501d085eaccea47af34212bb26a7
     Passwords%20do%20not%20match/singular: 37ca1f4e0afc9a0b8e9617f767103c92
-    Paused/singular: edb1f7b7219e1c9b7aa67159090d6991
     Payment%20frequency/singular: 63ded0e4ffb462ca8bd33d38e4691d86
     Pending/singular: 030a6f3395d5d4efddd3cc67d6009039
     per%20user%2Fmonth/singular: 72af182c1ba6df6732640f4d8a78d360
@@ -313,8 +296,6 @@ checksums:
     Priority%20email%20support/singular: 678538c912a770b1e1416ecdb8e299b1
     Privacy%20policy/singular: 462c6a536b52873e4498785c66dd48c8
     Private/singular: d740d0660e68c61db1853489356030ae
-    Pro%20Plan/singular: 76a09fd843b496610f8cf1dced417b62
-    Pro%20Plan%20%E2%88%9E/singular: a898be9e4610706b9b8146a209e8ba16
     Profile%20image%20updated/singular: 1ba6609b50bc217a36ab659563e78dae
     Profile%20picture/singular: d9b5e595877ffe2557486a987dd28274
     Public/singular: c834f11dab0881632aded3f01d4f8fa9
@@ -336,6 +317,7 @@ checksums:
     Resolution/singular: 6d8bd9e1bd7dae5ae38c93061d32990e
     Resources/singular: ec7fb05ed963bb6781a35782b3475502
     Review/singular: 299f75db25382980b2895622d7712927
+    Revoke/singular: be57685a85b6dfeaeb6eab4e9560b520
     Roadmap/singular: c60f4a1acf30e566861bf130f13b9ae7
     Role/singular: 53743bbb6ca938f5b893552e839d067f
     Run%20on%20your%20own%20infrastructure/singular: eba804911562b8dbf9d69c3e27f1d708
@@ -350,11 +332,7 @@ checksums:
     Send%20feedback/singular: 9631cc08d49da04475b30a0d320ce97c
     Senior/singular: 3fff865dc00435f82896fc302ea45630
     Settings/singular: 8df6777277469c1fd88cc18dde2f1cc3
-    Settings%20%7C%20Account/singular: 050e18406849ec057edac877c297c3e1
-    Settings%20%7C%20API/singular: 85101e4b802a09ad9e3f01ff116f0894
-    Settings%20%7C%20Billing/singular: e44cba741d5414035a0b499c5766c203
-    Settings%20%7C%20Integrations/singular: d04992e28016452f6d3d7dcc0b592415
-    Settings%20%7C%20Workspace/singular: 5d0bacf7ff696da940f232df45edfd39
+    Settings%20%7C%20%7B0%7D/singular: b8fc73080bc9c8f4f1403b2a69bd1ac5
     Sign%20in/singular: cb8757c7450e17de1e226e82fb0fa4a2
     Sign%20up%20%7C%20kan.bn/singular: f3de2a110c90358e6eac07d0b2f663a6
     Sign%20up%20disabled/singular: 9581b1f75b404ac0ecb7e603e0d4189c
@@ -366,7 +344,6 @@ checksums:
     Software%20Development/singular: 67659097ef6bcb194839858b2c4f3a3c
     Star%20on%20Github/singular: e5cb0428f1ac6485688f120d78742875
     Success/singular: c43827becada6750f7a25890905f38b9
-    Supercharge%20your%20workspace%20for%20just%20%2429%2Fmonth.%20Here's%20what%20you'll%20get%3A/singular: 21af8119141afcce5f12da489f34db6a
     Support/singular: 55aab5fd0f31a9cb055a2edeeedfaf63
     Support%20the%20development%20of%20the%20project/singular: c63bab228ab2b1be4370c668a99cd278
     System/singular: 803281c327a02a2feba182f4a2b38311
@@ -382,18 +359,14 @@ checksums:
     Theme/singular: 21fe00b7a518089576fb83c08631107a
     They%20won't%20be%20able%20to%20access%20this%20workspace./singular: 93b740350fe3430319fbca85349e41d9
     This%20action%20can't%20be%20undone./singular: cb222ff89715d8c971e8c25d121e1dbd
-    This%20API%20key%20will%20only%20be%20shown%20once.%20Please%20save%20it%20in%20a%20secure%20location./singular: 7df18d2978d317375f780822f8321c4d
     This%20board%20is%20private%20or%20does%20not%20exist/singular: a217ff3f04463b4df8c86adb6f83c6bc
     This%20board%20URL%20has%20already%20been%20taken/singular: 1d8b40332a031b5b77a3658e48dd51ca
     This%20will%20result%20in%20the%20permanent%20deletion%20of%20all%20data%20associated%20with%20this%20workspace./singular: a31141558af793635c1ddd2fa0a33499
     This%20will%20result%20in%20the%20permanent%20deletion%20of%20all%20data%20associated%20with%20your%20account./singular: b49224632bd6c3b7f5e462912aeb1081
-    This%20workspace%20URL%20has%20already%20been%20taken/singular: b455329e2a71da677acab91d3a00bad6
-    This%20workspace%20URL%20is%20reserved/singular: 7e47c892b93d4334c1606010c06e875e
     This%20workspace%20username%20has%20already%20been%20taken/singular: b7eadb89c615874f416d9658d0428c4c
     To%20Do/singular: d60813ea824f373462471e092d136eed
     Toggle%20menu/singular: 29dea3e0b6238874f8c7a27619df8e36
     Track%20all%20card%20changes%20with%20detailed%20activity%20history./singular: 0d3bac559c71ec4b8734f9f212320de5
-    Trello/singular: b5131f6488b5a439d58db3e22d6de45b
     Trello%20disconnected/singular: 54b24a3e6c9a7eedd8c8d1060ab1175d
     Trello%20imports/singular: 6827eca403faa8f89891d17827e72af9
     Triaging/singular: 1d40799fcae53a8a27688fdae2a48dee
@@ -426,7 +399,6 @@ checksums:
     Unlimited%20cards/singular: f44c1050c4d6aa39c8cdf5f4a7d12577
     Unlimited%20comments/singular: 31dbcf487c49a9997142e96bb3ab0040
     Unlimited%20lists/singular: 5c418701b27b9acbc5dd199719007362
-    Unlimited%20members/singular: f2949ca2dc18b0063af92e60779abb65
     Update/singular: 079fc039262fd31b10532929685c2d1b
     Update%20label/singular: 97880b503dfe956941c5f23025a1c102
     updated%20a%20checklist%20item/singular: 198e1d1d503f4b69b752dd84d0cc0e9d
@@ -434,8 +406,6 @@ checksums:
     updated%20the%20title/singular: 98cf8f12923ec1a58e767e3a40863b21
     updated%20the%20title%20to%20%3C0%3E%7B0%7D%3C%2F0%3E/singular: aca196d729401d8adc5c8ca9d558840e
     Upgrade/singular: 63c3b52882e0d779859307d672c178c2
-    Upgrade%20to%20Pro/singular: 972773025e763ddf53273df6d37a729a
-    Upgrade%20to%20Pro%20(%2429%2Fmonth)/singular: 9a91ea70f5eb55aac96640bf0fd7feff
     Upgrade%20to%20Team%20Plan/singular: 40e2ef151266937f8bbe63b3d361f645
     Urgent/singular: e79afcd4398e52e10e7e8243a7eecabe
     URL%20can%20only%20contain%20letters%2C%20numbers%2C%20and%20hyphens/singular: 875d37d2d920f98ef60a314eda8a5d9a
@@ -460,7 +430,6 @@ checksums:
     When%20Trello%20launched%20in%202011%2C%20it%20blew%20everyone%20away%20with%20its%20carefully%20designed%20simplicity%2C%20but%20over%20time%20(and%20atlassification)%20it%20lost%20its%20magic%20and%20grew%20into%20something%20closer%20to%20%22Jira%20Lite%22.%20This%20project%20is%20our%20attempt%20to%20recapture%20the%20original%20magic%20of%20Trello's%20simplicity%2C%20in%20open%20source./singular: 60a55e9bd16c3d1beff1a6c7633c5911
     Why%20make%20an%20open%20source%20Trello%3F/singular: 090833338ba8c64ef7a75e0f2615b34b
     Workspace/singular: b63ef0e99ee6f7fef6cbe4971ca6cf0f
-    Workspace%20created%20successfully.%20You%20can%20upgrade%20later%20in%20settings./singular: 8bbaba9f82ff076a08185ada1ee7eb94
     Workspace%20deleted/singular: bc5c267ce3f04de94ff1379cf2ca48a3
     Workspace%20description/singular: 7159d620b7ef5c5afef734989a5be08b
     Workspace%20description%20cannot%20exceed%20280%20characters/singular: d0e83b9a0304d7c36cf8c85d98783ce2
@@ -469,12 +438,10 @@ checksums:
     Workspace%20members/singular: 1857292f9567c556c781a23bd7e10544
     Workspace%20name/singular: 855614bbf862fd6a9f6a3e76943f92d4
     Workspace%20name%20cannot%20exceed%2024%20characters/singular: c8b8f79fb83abf8329cc34c1f51fcfc9
-    Workspace%20name%20is%20required/singular: b8c5162dd08c4d941bc57f9d0cbee451
     Workspace%20name%20must%20be%20at%20least%203%20characters%20long/singular: e448ea97418d44b18b4c21c22b8ba779
     Workspace%20name%20updated/singular: 3206ea410ee1ea4182b27ac0d89f92a1
     Workspace%20slug%20updated/singular: 527b92711d38cb35b40741df43aef047
     Workspace%20URL/singular: f4397a838da0f3a44cbd3ebe408ed6c3
-    workspace-url/singular: 2d034732ec536f3a2667f956fa50d394
     Writing/singular: 4f5f3ee3320c252921f80c42653c5d49
     Yearly/singular: 87f43e016c19cb25860f456549a2f431
     Yes%2C%20we%20offer%20an%20forever%20free%20plan%20for%20individual%20use.%20No%20restrictions%2C%20no%20paywalls%2C%20no%20limits./singular: 963cee303d0ff13c1719f4575e774fe3
@@ -484,7 +451,6 @@ checksums:
     You%20can%20self-host%20by%20following%20the%20instructions%20in%20our%20%3C0%3Erepo%3C%2F0%3E./singular: a6152a41b2d8f64d5a657e5b8bc808a9
     You%20have%20been%20logged%20in%20successfully./singular: ef8fad1dce13ae4112f17c5258655fea
     You%20have%20been%20signed%20up%20successfully./singular: f614a6e3b45f5ffb9a3b0fb420fef84b
-    You%20have%20unlimited%20seats%20with%20your%20Pro%20Plan.%20There%20is%20no%20additional%20charge%20for%20new%20members!/singular: e3dc59a5ba7211cd3d8516b3a79d85ca
     Your%20account%20has%20been%20deleted./singular: 8c8d944e07388c5877effdb2c2803dcf
     Your%20boards%20have%20been%20imported./singular: 403972e7a25afc2415762c1c2b1ec868
     Your%20display%20name%20has%20been%20updated./singular: 15e5fff36c554c16ec5214427fae1bf4

apps/web/lingui.config.ts

@@ -1,7 +1,7 @@
 import type { LinguiConfig } from "@lingui/conf";
 
 const config: LinguiConfig = {
-  locales: ["en", "fr", "de", "es", "it", "nl", "ru"],
+  locales: ["en", "fr", "de", "es", "it", "nl"],
   sourceLocale: "en",
   catalogs: [
     {

apps/web/next.config.js

@@ -52,15 +52,6 @@ const config = {
     // instrumentationHook: true,
     swcPlugins: [["@lingui/swc-plugin", {}]],
   },
-
-  async rewrites() {
-    return [
-      {
-        source: "/settings",
-        destination: "/settings/account",
-      },
-    ];
-  },
 };
 
 // Only allow external images when OIDC is configured (for OIDC provider avatars)

apps/web/package.json

@@ -59,7 +59,6 @@
     "react-dom": "catalog:react18",
     "react-hook-form": "^7.51.1",
     "react-icons": "^5.5.0",
-    "react-image-crop": "^11.0.10",
     "react-lottie-player": "^1.5.5",
     "react-markdown": "^10.1.0",
     "superjson": "2.2.1",

apps/web/src/components/Dropdown.tsx

@@ -15,7 +15,7 @@ export default function Dropdown({
       <div>
         <Menu.Button
           disabled={disabled}
-          className="flex h-7 w-7 items-center justify-center rounded-[5px] hover:bg-light-200 focus:outline-none dark:hover:bg-dark-200"
+          className="flex h-7 w-7 items-center justify-center rounded-[5px] hover:bg-light-200 dark:hover:bg-dark-200"
         >
           {children}
         </Menu.Button>
@@ -30,7 +30,7 @@ export default function Dropdown({
         leaveFrom="transform opacity-100 scale-100"
         leaveTo="transform opacity-0 scale-95"
       >
-        <Menu.Items className="absolute right-0 z-50 mt-2 w-56 origin-top-right rounded-md border border-light-200 bg-light-50 p-1 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none dark:border-dark-400 dark:bg-dark-300">
+        <Menu.Items className="absolute right-0 z-30 mt-2 w-56 origin-top-right rounded-md border border-light-200 bg-light-50 p-1 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none dark:border-dark-400 dark:bg-dark-300">
           <div className="flex flex-col">
             {items.map((item) => (
               <Menu.Item key={item.label}>

apps/web/src/components/LanguageSelector.tsx

@@ -13,7 +13,7 @@ export function LanguageSelector() {
         id="language-select"
         value={locale}
         onChange={(e) => setLocale(e.target.value as any)}
-        className="mt-8 block w-full max-w-[180px] rounded-lg border-0 bg-light-50 pl-10 text-sm shadow-sm ring-1 ring-inset ring-light-300 focus:ring-2 focus:ring-inset focus:ring-light-400 dark:bg-dark-50 dark:text-dark-1000 dark:ring-dark-300 dark:focus:ring-dark-500"
+        className="mt-8 block w-full max-w-[180px] rounded-lg border-0 bg-light-50 pl-10 shadow-sm ring-1 ring-inset ring-light-300 focus:ring-2 focus:ring-inset focus:ring-light-400 dark:bg-dark-50 dark:text-dark-1000 dark:ring-dark-300 dark:focus:ring-dark-500 sm:text-sm"
       >
         {availableLocales.map((loc) => (
           <option key={loc} value={loc}>

apps/web/src/components/NewWorkspaceForm.tsx

@@ -1,106 +1,30 @@
-import { zodResolver } from "@hookform/resolvers/zod";
 import { t } from "@lingui/core/macro";
-import { env } from "next-runtime-env";
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
 import { useForm } from "react-hook-form";
-import {
-  HiBolt,
-  HiCheck,
-  HiCheckBadge,
-  HiInformationCircle,
-  HiXMark,
-} from "react-icons/hi2";
-import { twMerge } from "tailwind-merge";
-import { z } from "zod";
+import { HiXMark } from "react-icons/hi2";
 
 import Button from "~/components/Button";
 import Input from "~/components/Input";
-import Toggle from "~/components/Toggle";
-import { useDebounce } from "~/hooks/useDebounce";
 import { useModal } from "~/providers/modal";
 import { usePopup } from "~/providers/popup";
 import { useWorkspace } from "~/providers/workspace";
 import { api } from "~/utils/api";
-import LoadingSpinner from "./LoadingSpinner";
 
-const schema = z.object({
-  name: z.string().min(1, { message: t`Workspace name is required` }),
-  slug: z
-    .string()
-    .min(3, {
-      message: t`URL must be at least 3 characters long`,
-    })
-    .max(24, { message: t`URL cannot exceed 24 characters` })
-    .regex(/^(?![-]+$)[a-zA-Z0-9-]+$/, {
-      message: t`URL can only contain letters, numbers, and hyphens`,
-    })
-    .optional()
-    .or(z.literal("")),
-});
-
-type FormValues = z.infer<typeof schema>;
+interface FormValues {
+  name: string;
+}
 
 export function NewWorkspaceForm() {
   const { closeModal } = useModal();
   const { showPopup } = usePopup();
-  const { switchWorkspace, availableWorkspaces } = useWorkspace();
-  const {
-    register,
-    handleSubmit,
-    formState: { errors },
-    watch,
-    trigger,
-    clearErrors,
-    setValue,
-  } = useForm<FormValues>({
-    resolver: zodResolver(schema),
-    defaultValues: {
-      name: "",
-      slug: "",
-    },
-    mode: "onSubmit",
-  });
+  const { switchWorkspace } = useWorkspace();
+  const { register, handleSubmit } = useForm<FormValues>();
   const utils = api.useUtils();
 
-  const hasAvailableWorkspaces = availableWorkspaces.length > 0;
-
-  const isCloudEnv = env("NEXT_PUBLIC_KAN_ENV") === "cloud";
-
-  const slug = watch("slug");
-  const [debouncedSlug] = useDebounce(slug, 500);
-  const isTyping = slug !== debouncedSlug;
-
-  // Pro toggle state management
-  const [isProToggleEnabled, setIsProToggleEnabled] = useState(false);
-  const [lastAvailableSlug, setLastAvailableSlug] = useState<string>("");
-
-  // Validate slug only after debounce
-  useEffect(() => {
-    if (isTyping) {
-      // Clear errors while typing
-      clearErrors("slug");
-    } else if (debouncedSlug) {
-      // Validate after debounce
-      void trigger("slug");
-    }
-  }, [isTyping, debouncedSlug, trigger, clearErrors]);
-
-  const checkWorkspaceSlugAvailability =
-    api.workspace.checkSlugAvailability.useQuery(
-      {
-        workspaceSlug: debouncedSlug ?? "",
-      },
-      {
-        enabled: !!debouncedSlug && debouncedSlug.length >= 3 && !errors.slug,
-      },
-    );
-
-  const isWorkspaceSlugAvailable = checkWorkspaceSlugAvailability.data;
-
   const createWorkspace = api.workspace.create.useMutation({
-    onSuccess: async (values, variables) => {
+    onSuccess: (values) => {
       if (values.publicId && values.name) {
-        void utils.workspace.all.invalidate();
+        utils.workspace.all.invalidate();
         switchWorkspace({
           publicId: values.publicId,
           name: values.name,
@@ -109,43 +33,6 @@ export function NewWorkspaceForm() {
           plan: values.plan,
           role: "admin",
         });
-
-        // If in cloud and Pro toggle is enabled, create checkout session for pro
-        if (env("NEXT_PUBLIC_KAN_ENV") === "cloud" && isProToggleEnabled) {
-          try {
-            const response = await fetch(
-              "/api/stripe/create_checkout_session",
-              {
-                method: "POST",
-                headers: {
-                  "Content-Type": "application/json",
-                },
-                body: JSON.stringify({
-                  slug: slug || undefined,
-                  workspacePublicId: values.publicId,
-                  cancelUrl: "/settings/workspace?upgrade=pro",
-                  successUrl: "/boards",
-                }),
-              },
-            );
-
-            const data = await response.json();
-            const url = (data as { url: string }).url;
-
-            if (url) {
-              window.location.href = url;
-              return; // Don't close modal if redirecting to checkout
-            }
-          } catch (error) {
-            console.error("Error creating checkout session:", error);
-            showPopup({
-              header: t`Error upgrading to Pro`,
-              message: t`Workspace created successfully. You can upgrade later in settings.`,
-              icon: "warning",
-            });
-          }
-        }
-
         closeModal();
       }
     },
@@ -164,74 +51,12 @@ export function NewWorkspaceForm() {
     if (nameElement) nameElement.focus();
   }, []);
 
-  const [shouldShowBenefits, setShouldShowBenefits] = useState(false);
-
-  const isValidSlug = slug && slug.length >= 3 && !errors.slug;
-
-  useEffect(() => {
-    if (
-      isCloudEnv &&
-      !checkWorkspaceSlugAvailability.isPending &&
-      isValidSlug
-    ) {
-      const isAvailable = isWorkspaceSlugAvailable?.isAvailable === true;
-      setShouldShowBenefits(isAvailable);
-
-      // Automatically enable Pro toggle when slug is available
-      if (isAvailable) {
-        setIsProToggleEnabled(true);
-        setLastAvailableSlug(slug);
-      }
-    }
-  }, [
-    isValidSlug,
-    isWorkspaceSlugAvailable?.isAvailable,
-    checkWorkspaceSlugAvailability.isPending,
-    slug,
-    isCloudEnv,
-  ]);
-
-  // Reset benefits when slug becomes invalid
-  useEffect(() => {
-    if (!isValidSlug) {
-      setShouldShowBenefits(false);
-    }
-  }, [isValidSlug]);
-
-  // Handle Pro toggle changes
-  const handleProToggleChange = () => {
-    if (isProToggleEnabled) {
-      // Turning off: clear the slug and disable Pro
-      setValue("slug", "");
-      setIsProToggleEnabled(false);
-    } else {
-      // Turning on: restore the last available slug if we have one
-      if (lastAvailableSlug) {
-        setValue("slug", lastAvailableSlug);
-      }
-      setIsProToggleEnabled(true);
-    }
-  };
-
-  const showProBenefits = isProToggleEnabled;
-
   const onSubmit = (values: FormValues) => {
-    // Don't submit if slug is provided but not available
-    if (values.slug && isWorkspaceSlugAvailable?.isAvailable === false) {
-      return;
-    }
-
     createWorkspace.mutate({
       name: values.name,
-      slug: !isCloudEnv && values.slug ? values.slug : undefined,
     });
   };
 
-  const isSlugAvailable =
-    isValidSlug &&
-    isWorkspaceSlugAvailable?.isAvailable &&
-    !isWorkspaceSlugAvailable?.isReserved;
-
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
       <div className="px-5 pt-5">
@@ -241,10 +66,7 @@ export function NewWorkspaceForm() {
           </h2>
           <button
             type="button"
-            className={twMerge(
-              "rounded p-1 hover:bg-light-200 focus:outline-none dark:hover:bg-dark-300",
-              !hasAvailableWorkspaces && "invisible",
-            )}
+            className="rounded p-1 hover:bg-light-200 focus:outline-none dark:hover:bg-dark-300"
             onClick={(e) => {
               e.preventDefault();
               closeModal();
@@ -258,7 +80,6 @@ export function NewWorkspaceForm() {
           id="workspace-name"
           placeholder={t`Workspace name`}
           {...register("name")}
-          errorMessage={errors.name?.message}
           onKeyDown={async (e) => {
             if (e.key === "Enter") {
               e.preventDefault();
@@ -266,121 +87,10 @@ export function NewWorkspaceForm() {
             }
           }}
         />
-
-        <div className="mt-4">
-          <Input
-            id="workspace-slug"
-            placeholder={t`workspace-url`}
-            {...register("slug")}
-            className={`${
-              isSlugAvailable
-                ? "focus:ring-green-500 dark:focus:ring-green-500"
-                : ""
-            }`}
-            errorMessage={
-              errors.slug?.message ??
-              (isWorkspaceSlugAvailable?.isAvailable === false &&
-              isWorkspaceSlugAvailable?.isReserved === false
-                ? t`This workspace URL has already been taken`
-                : isWorkspaceSlugAvailable?.isReserved
-                  ? t`This workspace URL is reserved`
-                  : undefined)
-            }
-            prefix={
-              env("NEXT_PUBLIC_KAN_ENV") === "cloud"
-                ? "kan.bn/"
-                : `${env("NEXT_PUBLIC_BASE_URL")}/`
-            }
-            iconRight={
-              slug && slug.length >= 3 && !errors.slug ? (
-                isWorkspaceSlugAvailable?.isAvailable ? (
-                  <HiCheck className="h-4 w-4 text-green-500" />
-                ) : checkWorkspaceSlugAvailability.isPending || isTyping ? (
-                  <LoadingSpinner />
-                ) : null
-              ) : null
-            }
-            onKeyDown={async (e) => {
-              if (e.key === "Enter") {
-                e.preventDefault();
-                await handleSubmit(onSubmit)();
-              }
-            }}
-          />
-
-          {slug && slug.length >= 3 && shouldShowBenefits && (
-            <div className="mt-2 flex items-center gap-1">
-              <HiInformationCircle className="h-4 w-4 text-dark-900" />
-              <p className="text-xs text-gray-500 dark:text-dark-900">
-                {t`Custom URLs require upgrading to a Pro plan`}
-              </p>
-            </div>
-          )}
-        </div>
-
-        {showProBenefits && (
-          <div className="mt-6">
-            <div className="rounded-md bg-light-100 p-3 text-xs text-light-900 dark:bg-dark-200 dark:text-dark-900">
-              <div className="space-y-3">
-                <div className="flex items-center space-x-3">
-                  <HiCheckBadge className="h-[18px] w-[18px] flex-shrink-0 text-light-1000 dark:text-dark-950" />
-                  <div className="flex items-center space-x-2">
-                    <span className="text-xs text-neutral-900 dark:text-dark-1000">
-                      {t`Unlimited members`}
-                    </span>
-                    <span className="inline-flex items-center rounded-full bg-emerald-500/10 px-2 py-0.5 text-[10px] font-medium text-emerald-600 ring-1 ring-inset ring-emerald-500/20 dark:text-emerald-400 sm:text-[10px]">
-                      {t`Launch offer`}
-                    </span>
-                  </div>
-                </div>
-                <div className="flex items-center space-x-3">
-                  <HiCheckBadge className="h-[18px] w-[18px] flex-shrink-0 text-light-1000 dark:text-dark-950" />
-                  <span className="text-xs text-neutral-900 dark:text-dark-1000">
-                    {t`Custom workspace URL`}
-                  </span>
-                </div>
-                <div className="flex items-center space-x-3">
-                  <HiCheckBadge className="h-[18px] w-[18px] flex-shrink-0 text-light-1000 dark:text-dark-950" />
-                  <div className="flex items-center space-x-2">
-                    <span className="text-xs text-neutral-900 dark:text-dark-1000">
-                      {t`Board analytics`}
-                    </span>
-                    <span className="inline-flex items-center rounded-full bg-gray-500/10 px-2 py-0.5 text-[10px] font-medium text-gray-600 ring-1 ring-inset ring-gray-500/20 dark:text-gray-400 sm:text-[10px]">
-                      {t`Coming soon`}
-                    </span>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        )}
       </div>
-      <div
-        className={twMerge(
-          "mt-6 flex items-center justify-end border-t border-light-600 px-5 pb-5 pt-5 dark:border-dark-600",
-          !showProBenefits && "mt-12",
-        )}
-      >
-        {/* Pro Toggle - only show in cloud environment */}
-        {isCloudEnv && (
-          <Toggle
-            isChecked={isProToggleEnabled}
-            onChange={handleProToggleChange}
-            label={t`Upgrade to Pro ($29/month)`}
-          />
-        )}
+      <div className="mt-12 flex items-center justify-end border-t border-light-600 px-5 pb-5 pt-5 dark:border-dark-600">
         <div>
-          <Button
-            type="submit"
-            isLoading={createWorkspace.isPending}
-            disabled={
-              createWorkspace.isPending ||
-              (!!slug &&
-                (checkWorkspaceSlugAvailability.isPending ||
-                  isWorkspaceSlugAvailable?.isAvailable === false ||
-                  isTyping))
-            }
-          >
+          <Button type="submit" isLoading={createWorkspace.isPending}>
             {t`Create workspace`}
           </Button>
         </div>

apps/web/src/components/SettingsLayout.tsx

@@ -1,148 +0,0 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
-import {
-  Listbox,
-  ListboxButton,
-  ListboxOption,
-  ListboxOptions,
-} from "@headlessui/react";
-import { t } from "@lingui/core/macro";
-import { env } from "next-runtime-env";
-import { useEffect, useState } from "react";
-import {
-  HiChevronDown,
-  HiOutlineBanknotes,
-  HiOutlineCodeBracketSquare,
-  HiOutlineRectangleGroup,
-  HiOutlineUser,
-} from "react-icons/hi2";
-
-interface SettingsLayoutProps {
-  children: React.ReactNode;
-  currentTab: string;
-}
-
-export function SettingsLayout({ children, currentTab }: SettingsLayoutProps) {
-  const router = useRouter();
-  const [selectedTabIndex, setSelectedTabIndex] = useState(0);
-
-  const settingsTabs = [
-    {
-      key: "account",
-      icon: <HiOutlineUser />,
-      label: t`Account`,
-      condition: true,
-    },
-    {
-      key: "workspace",
-      icon: <HiOutlineRectangleGroup />,
-      label: t`Workspace`,
-      condition: true,
-    },
-    {
-      key: "billing",
-      label: t`Billing`,
-      icon: <HiOutlineBanknotes />,
-      condition: env("NEXT_PUBLIC_KAN_ENV") === "cloud",
-    },
-    {
-      key: "api",
-      icon: <HiOutlineCodeBracketSquare />,
-      label: t`API`,
-      condition: true,
-    },
-    {
-      key: "integrations",
-      icon: <HiOutlineCodeBracketSquare />,
-      label: t`Integrations`,
-      condition: true,
-    },
-  ];
-
-  const availableTabs = settingsTabs.filter((tab) => tab.condition);
-
-  // Update selected tab when currentTab prop changes
-  useEffect(() => {
-    const tabIndex = availableTabs.findIndex((tab) => tab.key === currentTab);
-    if (tabIndex !== -1) {
-      setSelectedTabIndex(tabIndex);
-    }
-  }, [currentTab, availableTabs]);
-
-  const isTabActive = (tabKey: string) => {
-    return currentTab === tabKey;
-  };
-
-  return (
-    <div className="flex h-full w-full flex-col overflow-hidden">
-      <div className="h-full max-h-[calc(100vdh-3rem)] overflow-y-auto md:max-h-[calc(100vdh-4rem)]">
-        <div className="m-auto max-w-[1100px] px-5 py-6 md:px-28 md:py-12">
-          <div className="mb-8 flex w-full justify-between">
-            <h1 className="font-bold tracking-tight text-neutral-900 dark:text-dark-1000 sm:text-[1.2rem]">
-              {t`Settings`}
-            </h1>
-          </div>
-
-          <div className="focus:outline-none">
-            <div className="sm:hidden">
-              {/* Mobile dropdown */}
-              <Listbox
-                value={selectedTabIndex}
-                onChange={(index) => {
-                  const tabKey = availableTabs[index]?.key;
-                  if (tabKey) {
-                    void router.push(`/settings/${tabKey}`);
-                  }
-                }}
-              >
-                <div className="relative mb-4">
-                  <ListboxButton className="w-full appearance-none rounded-lg border-0 bg-light-50 py-2 pl-3 pr-10 text-left text-sm text-light-1000 shadow-sm ring-1 ring-inset ring-light-300 focus:ring-2 focus:ring-inset focus:ring-light-400 dark:bg-dark-50 dark:text-dark-1000 dark:ring-dark-300 dark:focus:ring-dark-500">
-                    {availableTabs[selectedTabIndex]?.label || "Select a tab"}
-                    <HiChevronDown
-                      aria-hidden="true"
-                      className="pointer-events-none absolute right-3 top-1/2 h-4 w-4 -translate-y-1/2 text-light-900 dark:text-dark-900"
-                    />
-                  </ListboxButton>
-                  <ListboxOptions className="absolute z-10 mt-1 w-full rounded-lg bg-light-50 py-1 text-sm shadow-lg ring-1 ring-inset ring-light-300 dark:bg-dark-50 dark:ring-dark-300">
-                    {availableTabs.map((tab) => (
-                      <ListboxOption
-                        key={tab.key}
-                        value={availableTabs.indexOf(tab)}
-                        className="relative cursor-pointer select-none py-2 pl-3 pr-9 text-light-1000 dark:text-dark-1000"
-                      >
-                        {tab.label}
-                      </ListboxOption>
-                    ))}
-                  </ListboxOptions>
-                </div>
-              </Listbox>
-            </div>
-            <div className="hidden sm:block">
-              <div className="border-b border-gray-200 dark:border-white/10">
-                <nav
-                  aria-label="Tabs"
-                  className="-mb-px flex space-x-8 focus:outline-none"
-                >
-                  {availableTabs.map((tab) => (
-                    <Link
-                      key={tab.key}
-                      href={`/settings/${tab.key}`}
-                      className={`whitespace-nowrap border-b-2 px-1 py-4 text-sm font-medium transition-colors focus:outline-none ${
-                        isTabActive(tab.key)
-                          ? "border-light-1000 text-light-1000 dark:border-dark-1000 dark:text-dark-1000"
-                          : "border-transparent text-light-900 hover:border-light-950 hover:text-light-950 dark:text-dark-900 dark:hover:border-white/20 dark:hover:text-dark-950"
-                      }`}
-                    >
-                      {tab.label}
-                    </Link>
-                  ))}
-                </nav>
-              </div>
-            </div>
-            <div className="focus:outline-none">{children}</div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

apps/web/src/components/WorkspaceMenu.tsx

@@ -20,12 +20,12 @@ export default function WorkspaceMenu({
     <Menu as="div" className="relative inline-block w-full pb-3 text-left">
       <div>
         {isLoading ? (
-          <div className={twMerge("mb-1 flex", isCollapsed && "md:p-1.5")}>
+          <div className={twMerge("mb-1", isCollapsed && "md:flex md:p-1.5")}>
             <div className="h-6 w-6 animate-pulse rounded-md bg-light-200 dark:bg-dark-200" />
             <div
               className={twMerge(
                 "ml-2 h-6 w-[150px] animate-pulse rounded-md bg-light-200 dark:bg-dark-200",
-                isCollapsed && "md:hidden",
+                isCollapsed && "hidden md:block",
               )}
             />
           </div>
@@ -44,7 +44,7 @@ export default function WorkspaceMenu({
             </span>
             <span
               className={twMerge(
-                "ml-2 truncate text-sm font-bold text-neutral-900 dark:text-dark-1000",
+                "ml-2 text-sm font-bold text-neutral-900 dark:text-dark-1000",
                 isCollapsed && "md:hidden",
               )}
             >
@@ -87,17 +87,17 @@ export default function WorkspaceMenu({
                     onClick={() => switchWorkspace(availableWorkspace)}
                     className="flex w-full items-center justify-between rounded-[5px] px-3 py-2 text-left text-sm text-neutral-900 hover:bg-light-200 dark:text-dark-1000 dark:hover:bg-dark-400"
                   >
-                    <div className="flex min-w-0 flex-1 items-center">
-                      <span className="inline-flex h-5 w-5 flex-shrink-0 items-center justify-center rounded-[5px] bg-indigo-700">
+                    <div>
+                      <span className="inline-flex h-5 w-5 items-center justify-center rounded-[5px] bg-indigo-700">
                         <span className="text-xs font-medium leading-none text-white">
                           {availableWorkspace.name.charAt(0).toUpperCase()}
                         </span>
                       </span>
-                      <span className="ml-2 truncate text-xs font-medium">
+                      <span className="ml-2 text-xs font-medium">
                         {availableWorkspace.name}
                       </span>
                     </div>
-                    {workspace.publicId === availableWorkspace.publicId && (
+                    {workspace.name === availableWorkspace.name && (
                       <span>
                         <HiCheck className="h-4 w-4" aria-hidden="true" />
                       </span>

apps/web/src/components/modal.tsx

@@ -34,7 +34,7 @@ const Modal: React.FC<Props> = ({
 
   return (
     <Transition.Root show={shouldShow} as={Fragment}>
-      <Dialog as="div" className="relative z-50" onClose={closeModal}>
+      <Dialog as="div" className="relative z-10" onClose={closeModal}>
         <Transition.Child
           as={Fragment}
           enter="ease-out duration-300"
@@ -47,7 +47,7 @@ const Modal: React.FC<Props> = ({
           <div className="fixed inset-0 bg-light-50 bg-opacity-40 transition-opacity dark:bg-dark-50 dark:bg-opacity-40" />
         </Transition.Child>
 
-        <div className="fixed inset-0 z-50 w-screen overflow-y-auto">
+        <div className="fixed inset-0 z-10 w-screen overflow-y-auto">
           <div className="flex min-h-full items-start justify-center p-4 text-center sm:items-start sm:p-0">
             <Transition.Child
               as={Fragment}

apps/web/src/hooks/useClipboard.tsx

@@ -1,36 +0,0 @@
-import { useState } from "react";
-
-export function useClipboard({ timeout = 500 } = {}) {
-  const [error, setError] = useState<string | Error | null | undefined>(null);
-  const [copied, setCopied] = useState<boolean>(false);
-  const [copyTimeout, setCopyTimeout] = useState<number | undefined>(undefined);
-
-  const handleCopyResult = (hasError: boolean) => {
-    clearTimeout(copyTimeout);
-
-    setCopyTimeout(
-      setTimeout(() => setCopied(false), timeout) as unknown as number,
-    );
-
-    setCopied(hasError);
-  };
-
-  const copy = (value: string) => {
-    if ("clipboard" in navigator) {
-      navigator.clipboard
-        .writeText(value)
-        .then(() => handleCopyResult(true))
-        .catch((err) => setError(err));
-    } else {
-      setError(new Error("Error: navigator.clipboard is not supported"));
-    }
-  };
-
-  const reset = () => {
-    setError(null);
-    setCopied(false);
-    clearTimeout(copyTimeout);
-  };
-
-  return { copy, reset, error, copied };
-}

apps/web/src/locales/de/messages.po

@@ -36,12 +36,12 @@ msgstr "{0} Labels"
 msgid "{boardCount, plural, one {Import board (1)} other {Import boards ({boardCount})}}"
 msgstr "{boardCount, plural, one {Board importieren (1)} other {Boards importieren ({boardCount})}}"
 
-#: src/views/members/components/InviteMemberForm.tsx:92
-#: src/views/members/components/InviteMemberForm.tsx:104
+#: src/views/members/components/InviteMemberForm.tsx:91
+#: src/views/members/components/InviteMemberForm.tsx:106
 msgid "$10/month"
 msgstr "$10/Monat"
 
-#: src/views/members/components/InviteMemberForm.tsx:104
+#: src/views/members/components/InviteMemberForm.tsx:106
 msgid "$8/month"
 msgstr "$8/Monat"
 
@@ -53,10 +53,6 @@ msgstr "1 Benutzer"
 msgid "A powerful, flexible kanban app that helps you organise work, track progress, and deliver results—all in one place."
 msgstr "Eine leistungsstarke, flexible Kanban-App, die dir hilft, Arbeit zu organisieren, Fortschritte zu verfolgen und Ergebnisse zu liefern – alles an einem Ort."
 
-#: src/components/SettingsLayout.tsx:33
-msgid "Account"
-msgstr "Konto"
-
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:27
 msgid "Account deleted"
 msgstr "Konto gelöscht"
@@ -95,13 +91,13 @@ msgstr "Beschreibung hinzufügen... (tippe '/' um Befehle zu öffnen oder '@' um
 msgid "Add details..."
 msgstr "Details hinzufügen..."
 
-#: src/views/card/components/LabelSelector.tsx:109
-#: src/views/card/components/LabelSelector.tsx:114
+#: src/views/card/components/LabelSelector.tsx:110
+#: src/views/card/components/LabelSelector.tsx:118
 msgid "Add label"
 msgstr "Label hinzufügen"
 
 #: src/views/card/components/MemberSelector.tsx:130
-#: src/views/members/components/InviteMemberForm.tsx:147
+#: src/views/members/components/InviteMemberForm.tsx:149
 msgid "Add member"
 msgstr "Mitglied hinzufügen"
 
@@ -136,14 +132,10 @@ msgstr "hat Checklistenelement <0>{0}</0> hinzugefügt"
 msgid "added label <0>{0}</0>"
 msgstr "hat Label <0>{0}</0> hinzugefügt"
 
-#: src/views/members/components/InviteMemberForm.tsx:187
+#: src/views/members/components/InviteMemberForm.tsx:186
 msgid "Adding a new member will cost an additional {price} ({billingType}) per seat."
 msgstr "Das Hinzufügen eines neuen Mitglieds kostet zusätzlich {price} ({billingType}) pro Platz."
 
-#: src/views/settings/components/Avatar.tsx:278
-msgid "Adjust the square crop to fit your avatar."
-msgstr "Passe den quadratischen Zuschnitt an deinen Avatar an."
-
 #: src/views/home/components/Pricing.tsx:55
 msgid "Admin roles"
 msgstr "Administratorrollen"
@@ -156,7 +148,7 @@ msgstr "Alle Systeme funktionieren"
 msgid "Already have an account? <0><1>Sign in</1></0>"
 msgstr "Du hast bereits ein Konto? <0><1>Anmelden</1></0>"
 
-#: src/views/settings/IntegrationsSettings.tsx:61
+#: src/views/settings/index.tsx:102
 msgid "An error occurred while disconnecting your Trello account."
 msgstr "Beim Trennen deines Trello-Kontos ist ein Fehler aufgetreten."
 
@@ -164,27 +156,7 @@ msgstr "Beim Trennen deines Trello-Kontos ist ein Fehler aufgetreten."
 msgid "An unexpected error occurred. Please try again later."
 msgstr "Ein unerwarteter Fehler ist aufgetreten. Bitte versuchen Sie es später erneut."
 
-#: src/components/SettingsLayout.tsx:51
-msgid "API"
-msgstr "API"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:91
-msgid "API key created"
-msgstr "API-Schlüssel erstellt"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:161
-msgid "API key name"
-msgstr "API-Schlüsselname"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:25
-msgid "API key name cannot exceed 30 characters"
-msgstr "Der API-Schlüsselname darf 30 Zeichen nicht überschreiten"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:24
-msgid "API key name is required"
-msgstr "API-Schlüsselname ist erforderlich"
-
-#: src/views/settings/ApiSettings.tsx:22
+#: src/views/settings/index.tsx:259
 msgid "API keys"
 msgstr "API-Schlüssel"
 
@@ -246,21 +218,20 @@ msgstr "Backlog"
 msgid "Basic Kanban"
 msgstr "Einfaches Kanban"
 
-#: src/views/members/components/InviteMemberForm.tsx:105
+#: src/views/members/components/InviteMemberForm.tsx:107
 msgid "billed annually"
 msgstr "jährlich abgerechnet"
 
-#: src/views/members/components/InviteMemberForm.tsx:105
+#: src/views/members/components/InviteMemberForm.tsx:107
 msgid "billed monthly"
 msgstr "monatlich abgerechnet"
 
-#: src/components/SettingsLayout.tsx:44
 #: src/views/boards/components/TemplateBoards.tsx:55
-#: src/views/settings/BillingSettings.tsx:39
+#: src/views/settings/index.tsx:198
 msgid "Billing"
 msgstr "Abrechnung"
 
-#: src/views/settings/BillingSettings.tsx:49
+#: src/views/settings/index.tsx:208
 msgid "Billing portal"
 msgstr "Abrechnungsportal"
 
@@ -272,11 +243,6 @@ msgstr "Blogbeitrag"
 msgid "Board"
 msgstr "Board"
 
-#: src/components/NewWorkspaceForm.tsx:346
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:81
-msgid "Board analytics"
-msgstr "Board-Analytik"
-
 #: src/views/boards/components/NewBoardForm.tsx:21
 msgid "Board name cannot exceed 100 characters"
 msgstr "Der Name des Boards darf 100 Zeichen nicht überschreiten"
@@ -315,12 +281,12 @@ msgid "Board visibility updated"
 msgstr "Board-Sichtbarkeit aktualisiert"
 
 #: src/components/SideNavigation.tsx:68
-#: src/views/boards/index.tsx:32
+#: src/views/boards/index.tsx:27
 msgid "Boards"
 msgstr "Boards"
 
 #. placeholder {0}: workspace.name ?? "Workspace"
-#: src/views/boards/index.tsx:28
+#: src/views/boards/index.tsx:23
 msgid "Boards | {0}"
 msgstr "Boards | {0}"
 
@@ -342,11 +308,10 @@ msgstr "Fehlerbericht"
 #: src/views/card/components/DeleteChecklistConfirmation.tsx:63
 #: src/views/card/components/DeleteCommentConfirmation.tsx:76
 #: src/views/members/components/DeleteMemberConfirmation.tsx:55
-#: src/views/settings/components/Avatar.tsx:309
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:168
+#: src/views/settings/components/CustomURLConfirmation.tsx:50
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:88
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:98
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:104
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -358,16 +323,16 @@ msgstr "Karte nicht gefunden"
 msgid "Card title"
 msgstr "Kartentitel"
 
-#: src/views/settings/AccountSettings.tsx:70
-#: src/views/settings/AccountSettings.tsx:80
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:109
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:178
+#: src/views/settings/index.tsx:291
+#: src/views/settings/index.tsx:301
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: src/views/settings/AccountSettings.tsx:45
-msgid "Change your language preferences."
-msgstr "Ändern Sie Ihre Spracheinstellungen."
+#: src/views/settings/index.tsx:190
+msgid "Change the language of the app."
+msgstr "Ändere die Sprache der App."
 
 #: src/views/auth/login/index.tsx:41
 #: src/views/auth/signup/index.tsx:67
@@ -387,10 +352,6 @@ msgstr "Filter löschen"
 msgid "Click on the link we've sent to {magicLinkRecipient} to sign in."
 msgstr "Klicke auf den Link, den wir an {magicLinkRecipient} gesendet haben, um dich anzumelden."
 
-#: src/views/settings/components/NewApiKeyModal.tsx:136
-msgid "Close"
-msgstr "Schließen"
-
 #: src/views/boards/components/TemplateBoards.tsx:22
 msgid "Code Review"
 msgstr "Code-Review"
@@ -399,9 +360,7 @@ msgstr "Code-Review"
 msgid "Collaborate seamlessly with your team."
 msgstr "Arbeite nahtlos mit deinem Team zusammen."
 
-#: src/components/NewWorkspaceForm.tsx:349
 #: src/views/home/components/Features.tsx:66
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:84
 msgid "Coming soon"
 msgstr "Demnächst verfügbar"
 
@@ -430,12 +389,16 @@ msgstr "hat ein Checklistenelement abgeschlossen"
 msgid "completed checklist item <0>{0}</0>"
 msgstr "hat Checklistenelement <0>{0}</0> abgeschlossen"
 
+#: src/views/settings/components/CustomURLConfirmation.tsx:42
+msgid "Confirm URL change"
+msgstr "URL-Änderung bestätigen"
+
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:150
 msgid "Confirm your new password"
 msgstr "Bestätigen Sie Ihr neues Passwort"
 
 #: src/views/boards/components/ImportBoardsForm.tsx:157
-#: src/views/settings/IntegrationsSettings.tsx:93
+#: src/views/settings/index.tsx:235
 msgid "Connect Trello"
 msgstr "Trello verbinden"
 
@@ -443,7 +406,7 @@ msgstr "Trello verbinden"
 msgid "Connect your favorite tools to streamline your workflow."
 msgstr "Verbinde deine Lieblingstools, um deinen Arbeitsablauf zu optimieren."
 
-#: src/views/settings/IntegrationsSettings.tsx:80
+#: src/views/settings/index.tsx:222
 msgid "Connect your Trello account to import boards."
 msgstr "Verbinde dein Trello-Konto, um Boards zu importieren."
 
@@ -478,10 +441,6 @@ msgstr "Kontrolliere, wer deine Boards ansehen und bearbeiten kann."
 msgid "Create another"
 msgstr "Weitere erstellen"
 
-#: src/views/settings/components/NewApiKeyModal.tsx:175
-msgid "Create API key"
-msgstr "API-Schlüssel erstellen"
-
 #: src/views/boards/components/NewBoardForm.tsx:128
 msgid "Create board"
 msgstr "Board erstellen"
@@ -506,12 +465,12 @@ msgstr "Liste erstellen"
 msgid "Create new board"
 msgstr "Neues Board erstellen"
 
-#: src/views/settings/ApiSettings.tsx:30
+#: src/views/settings/components/CreateAPIKeyForm.tsx:54
 msgid "Create new key"
 msgstr "Neuen Schlüssel erstellen"
 
 #: src/views/board/components/NewCardForm.tsx:394
-#: src/views/card/components/LabelSelector.tsx:97
+#: src/views/card/components/LabelSelector.tsx:98
 msgid "Create new label"
 msgstr "Neues Label erstellen"
 
@@ -519,7 +478,7 @@ msgstr "Neues Label erstellen"
 msgid "Create new list"
 msgstr "Neue Liste erstellen"
 
-#: src/components/NewWorkspaceForm.tsx:384
+#: src/components/NewWorkspaceForm.tsx:94
 #: src/components/WorkspaceMenu.tsx:116
 msgid "Create workspace"
 msgstr "Arbeitsbereich erstellen"
@@ -532,10 +491,6 @@ msgstr "hat die Karte erstellt"
 msgid "Critical"
 msgstr "Kritisch"
 
-#: src/views/settings/components/Avatar.tsx:275
-msgid "Crop your avatar"
-msgstr "Schneide deinen Avatar zu"
-
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:19
 msgid "Current password is required"
 msgstr "Aktuelles Passwort ist erforderlich"
@@ -544,14 +499,9 @@ msgstr "Aktuelles Passwort ist erforderlich"
 msgid "Custom domain"
 msgstr "Benutzerdefinierte Domain"
 
-#: src/components/NewWorkspaceForm.tsx:315
-msgid "Custom URLs require upgrading to a Pro plan"
-msgstr "Benutzerdefinierte URLs erfordern ein Upgrade auf einen Pro-Plan"
-
-#: src/components/NewWorkspaceForm.tsx:339
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:74
-msgid "Custom workspace URL"
-msgstr "Benutzerdefinierte Workspace-URL"
+#: src/views/settings/components/CustomURLConfirmation.tsx:45
+msgid "Custom URLs are a premium feature. You'll be directed to upgrade your account."
+msgstr "Benutzerdefinierte URLs sind eine Premium-Funktion. Du wirst zur Aktualisierung deines Kontos weitergeleitet."
 
 #: src/views/boards/components/TemplateBoards.tsx:41
 msgid "Customer Support"
@@ -569,9 +519,9 @@ msgstr "Dunkel"
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/views/settings/AccountSettings.tsx:52
-#: src/views/settings/AccountSettings.tsx:62
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:96
+#: src/views/settings/index.tsx:309
+#: src/views/settings/index.tsx:319
 msgid "Delete account"
 msgstr "Konto löschen"
 
@@ -592,8 +542,8 @@ msgid "Delete list"
 msgstr "Liste löschen"
 
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:106
-#: src/views/settings/WorkspaceSettings.tsx:96
-#: src/views/settings/WorkspaceSettings.tsx:107
+#: src/views/settings/index.tsx:272
+#: src/views/settings/index.tsx:283
 msgid "Delete workspace"
 msgstr "Workspace löschen"
 
@@ -619,7 +569,7 @@ msgstr "hat Checklistenelement <0>{0}</0> gelöscht"
 msgid "Design"
 msgstr "Design"
 
-#: src/views/settings/IntegrationsSettings.tsx:108
+#: src/views/settings/index.tsx:250
 msgid "Disconnect Trello"
 msgstr "Trello trennen"
 
@@ -627,7 +577,7 @@ msgstr "Trello trennen"
 msgid "Discuss and collaborate on cards."
 msgstr "Diskutiere und arbeite gemeinsam an Karten."
 
-#: src/views/settings/AccountSettings.tsx:35
+#: src/views/settings/index.tsx:151
 msgid "Display name"
 msgstr "Anzeigename"
 
@@ -697,7 +647,7 @@ msgstr "Bearbeitung"
 msgid "email"
 msgstr "E-Mail"
 
-#: src/views/members/components/InviteMemberForm.tsx:161
+#: src/views/members/components/InviteMemberForm.tsx:163
 msgid "Email"
 msgstr "E-Mail"
 
@@ -745,12 +695,12 @@ msgstr "Fehler beim Löschen des Labels"
 msgid "Error deleting workspace"
 msgstr "Fehler beim Löschen des Arbeitsbereichs"
 
-#: src/views/settings/IntegrationsSettings.tsx:60
+#: src/views/settings/index.tsx:101
 msgid "Error disconnecting Trello"
 msgstr "Fehler beim Trennen von Trello"
 
-#: src/views/members/components/InviteMemberForm.tsx:71
-#: src/views/members/components/InviteMemberForm.tsx:77
+#: src/views/members/components/InviteMemberForm.tsx:76
+#: src/views/members/components/InviteMemberForm.tsx:82
 msgid "Error inviting member"
 msgstr "Fehler beim Einladen des Mitglieds"
 
@@ -758,7 +708,7 @@ msgstr "Fehler beim Einladen des Mitglieds"
 msgid "Error updating display name"
 msgstr "Fehler beim Aktualisieren des Anzeigenamens"
 
-#: src/views/settings/components/Avatar.tsx:80
+#: src/views/settings/components/Avatar.tsx:39
 msgid "Error updating profile image"
 msgstr "Fehler beim Aktualisieren des Profilbilds"
 
@@ -774,17 +724,12 @@ msgstr "Fehler beim Aktualisieren des Arbeitsbereichsnamens"
 msgid "Error updating workspace URL"
 msgstr "Fehler beim Aktualisieren der Workspace-URL"
 
-#: src/views/members/components/InviteMemberForm.tsx:130
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:41
+#: src/views/members/components/InviteMemberForm.tsx:132
 msgid "Error upgrading subscription"
 msgstr "Fehler beim Upgrade des Abonnements"
 
-#: src/components/NewWorkspaceForm.tsx:142
-msgid "Error upgrading to Pro"
-msgstr "Fehler beim Upgrade auf Pro"
-
-#: src/views/settings/components/Avatar.tsx:94
-#: src/views/settings/components/Avatar.tsx:221
+#: src/views/settings/components/Avatar.tsx:56
+#: src/views/settings/components/Avatar.tsx:97
 msgid "Error uploading profile image"
 msgstr "Fehler beim Hochladen des Profilbilds"
 
@@ -849,8 +794,8 @@ msgstr "Für langfristige Nachhaltigkeit erkennen wir an, dass alle guten Open-S
 msgid "Free"
 msgstr "Kostenlos"
 
-#: src/views/members/components/InviteMemberForm.tsx:193
-#: src/views/members/index.tsx:208
+#: src/views/members/components/InviteMemberForm.tsx:192
+#: src/views/members/index.tsx:184
 msgid "Free Plan"
 msgstr "Kostenloser Plan"
 
@@ -959,7 +904,7 @@ msgstr "Ideen"
 msgid "Ideas to improve this page..."
 msgstr "Ideen zur Verbesserung dieser Seite..."
 
-#: src/views/boards/index.tsx:43
+#: src/views/boards/index.tsx:38
 msgid "Import"
 msgstr "Importieren"
 
@@ -997,7 +942,6 @@ msgstr "In Bearbeitung"
 msgid "Individuals"
 msgstr "Einzelpersonen"
 
-#: src/components/SettingsLayout.tsx:57
 #: src/views/home/components/Features.tsx:114
 msgid "Integrations"
 msgstr "Integrationen"
@@ -1006,24 +950,24 @@ msgstr "Integrationen"
 msgid "Interviewing"
 msgstr "Vorstellungsgespräch"
 
-#: src/views/members/components/InviteMemberForm.tsx:40
+#: src/views/members/components/InviteMemberForm.tsx:45
 msgid "Invalid email address"
 msgstr "Ungültige E-Mail-Adresse"
 
-#: src/views/members/index.tsx:221
+#: src/views/members/index.tsx:193
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/views/members/components/InviteMemberForm.tsx:208
+#: src/views/members/components/InviteMemberForm.tsx:207
 msgid "Invite another"
 msgstr "Weitere Person einladen"
 
-#: src/views/card/components/MemberSelector.tsx:111
-#: src/views/members/components/InviteMemberForm.tsx:233
+#: src/views/card/components/MemberSelector.tsx:112
+#: src/views/members/components/InviteMemberForm.tsx:231
 msgid "Invite member"
 msgstr "Mitglied einladen"
 
-#: src/views/members/components/InviteMemberForm.tsx:196
+#: src/views/members/components/InviteMemberForm.tsx:195
 msgid "Inviting members requires a Team Plan. You'll be redirected to upgrade your workspace."
 msgstr "Das Einladen von Mitgliedern erfordert einen Team-Plan. Sie werden weitergeleitet, um Ihren Workspace zu upgraden."
 
@@ -1054,23 +998,10 @@ msgstr "Labels"
 msgid "Labels & Filters"
 msgstr "Labels & Filter"
 
-#: src/views/settings/AccountSettings.tsx:42
+#: src/views/settings/index.tsx:187
 msgid "Language"
 msgstr "Sprache"
 
-#: src/components/NewWorkspaceForm.tsx:332
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:67
-msgid "Launch offer"
-msgstr "Einführungsangebot"
-
-#: src/views/members/index.tsx:191
-msgid "Launch offer: Get unlimited members with Pro"
-msgstr "Einführungsangebot: Erhalten Sie unbegrenzte Mitglieder mit Pro"
-
-#: src/views/home/components/Pricing.tsx:99
-msgid "Launch offer: unlimited seats for just $29/month with Pro"
-msgstr "Einführungsangebot: unbegrenzte Plätze für nur $29/Monat mit Pro"
-
 #: src/views/boards/components/TemplateBoards.tsx:83
 msgid "Learning"
 msgstr "Lernen"
@@ -1136,12 +1067,12 @@ msgstr "Mittlere Priorität"
 #: src/views/board/components/Filters.tsx:93
 #: src/views/board/components/NewCardForm.tsx:357
 #: src/views/card/index.tsx:125
-#: src/views/members/index.tsx:178
+#: src/views/members/index.tsx:171
 msgid "Members"
 msgstr "Mitglieder"
 
 #. placeholder {0}: workspace.name ?? "Workspace"
-#: src/views/members/index.tsx:173
+#: src/views/members/index.tsx:167
 msgid "Members | {0}"
 msgstr "Mitglieder | {0}"
 
@@ -1149,7 +1080,7 @@ msgstr "Mitglieder | {0}"
 msgid "Monthly"
 msgstr "Monatlich"
 
-#: src/views/members/components/InviteMemberForm.tsx:93
+#: src/views/members/components/InviteMemberForm.tsx:92
 msgid "monthly billing"
 msgstr "monatliche Abrechnung"
 
@@ -1172,14 +1103,10 @@ msgstr "Name"
 msgid "Need help?"
 msgstr "Brauchst du Hilfe?"
 
-#: src/views/boards/index.tsx:53
+#: src/views/boards/index.tsx:48
 msgid "New"
 msgstr "Neu"
 
-#: src/views/settings/components/NewApiKeyModal.tsx:147
-msgid "New API key"
-msgstr "Neuer API-Schlüssel"
-
 #: src/views/boards/components/NewBoardForm.tsx:85
 msgid "New board"
 msgstr "Neues Board"
@@ -1217,7 +1144,7 @@ msgstr "Neues Passwort muss sich vom aktuellen Passwort unterscheiden"
 msgid "New Ticket"
 msgstr "Neues Ticket"
 
-#: src/components/NewWorkspaceForm.tsx:240
+#: src/components/NewWorkspaceForm.tsx:65
 msgid "New workspace"
 msgstr "Neuer Workspace"
 
@@ -1253,11 +1180,11 @@ msgstr "Angebot"
 msgid "Onboarding"
 msgstr "Einarbeitung"
 
-#: src/views/settings/AccountSettings.tsx:55
+#: src/views/settings/index.tsx:312
 msgid "Once you delete your account, there is no going back. This action cannot be undone."
 msgstr "Sobald Sie Ihr Konto löschen, gibt es kein Zurück mehr. Diese Aktion kann nicht rückgängig gemacht werden."
 
-#: src/views/settings/WorkspaceSettings.tsx:99
+#: src/views/settings/index.tsx:275
 msgid "Once you delete your workspace, there is no going back. This action cannot be undone."
 msgstr "Sobald Sie Ihren Arbeitsbereich löschen, gibt es kein Zurück mehr. Diese Aktion kann nicht rückgängig gemacht werden."
 
@@ -1289,15 +1216,11 @@ msgstr "Passwort muss mindestens 8 Zeichen lang sein"
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein"
 
-#: src/views/members/index.tsx:134
-msgid "Paused"
-msgstr "Pausiert"
-
-#: src/views/home/components/Pricing.tsx:102
+#: src/views/home/components/Pricing.tsx:96
 msgid "Payment frequency"
 msgstr "Zahlungshäufigkeit"
 
-#: src/views/members/index.tsx:134
+#: src/views/members/index.tsx:128
 msgid "Pending"
 msgstr "Ausstehend"
 
@@ -1330,13 +1253,13 @@ msgstr "Bitte gib einen gültigen Namen ein"
 msgid "Please enter a valid password"
 msgstr "Bitte gib ein gültiges Passwort ein"
 
-#: src/views/settings/components/Avatar.tsx:95
+#: src/views/settings/components/Avatar.tsx:57
 msgid "Please select a file to upload."
 msgstr "Bitte wähle eine Datei zum Hochladen aus."
 
 #: src/components/DeleteLabelConfirmation.tsx:26
 #: src/components/FeedbackModal.tsx:41
-#: src/components/NewWorkspaceForm.tsx:155
+#: src/components/NewWorkspaceForm.tsx:42
 #: src/views/board/components/NewCardForm.tsx:174
 #: src/views/board/components/NewListForm.tsx:78
 #: src/views/board/components/UpdateBoardSlugForm.tsx:72
@@ -1351,25 +1274,24 @@ msgstr "Bitte wähle eine Datei zum Hochladen aus."
 #: src/views/card/components/DeleteCardConfirmation.tsx:52
 #: src/views/card/components/DeleteChecklistConfirmation.tsx:37
 #: src/views/card/components/DeleteCommentConfirmation.tsx:45
-#: src/views/card/components/LabelSelector.tsx:72
-#: src/views/card/components/ListSelector.tsx:52
-#: src/views/card/components/MemberSelector.tsx:79
+#: src/views/card/components/LabelSelector.tsx:73
+#: src/views/card/components/ListSelector.tsx:53
+#: src/views/card/components/MemberSelector.tsx:80
 #: src/views/card/components/NewChecklistForm.tsx:70
 #: src/views/card/components/NewChecklistItemForm.tsx:89
 #: src/views/card/components/NewCommentForm.tsx:31
 #: src/views/card/index.tsx:173
 #: src/views/members/components/DeleteMemberConfirmation.tsx:28
-#: src/views/members/components/InviteMemberForm.tsx:78
-#: src/views/members/components/InviteMemberForm.tsx:131
-#: src/views/settings/components/Avatar.tsx:81
-#: src/views/settings/components/Avatar.tsx:222
+#: src/views/members/components/InviteMemberForm.tsx:83
+#: src/views/members/components/InviteMemberForm.tsx:133
+#: src/views/settings/components/Avatar.tsx:40
+#: src/views/settings/components/Avatar.tsx:98
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:40
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:46
 #: src/views/settings/components/UpdateDisplayNameForm.tsx:55
 #: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:62
 #: src/views/settings/components/UpdateWorkspaceNameForm.tsx:57
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:74
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:42
 msgid "Please try again later, or contact customer support."
 msgstr "Bitte versuche es später noch einmal oder kontaktiere den Kundensupport."
 
@@ -1380,7 +1302,6 @@ msgid "Pricing"
 msgstr "Preise"
 
 #: src/views/home/components/Pricing.tsx:56
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:91
 msgid "Priority email support"
 msgstr "Prioritäts-E-Mail-Support"
 
@@ -1392,19 +1313,11 @@ msgstr "Datenschutzrichtlinie"
 msgid "Private"
 msgstr "Privat"
 
-#: src/views/members/index.tsx:205
-msgid "Pro Plan"
-msgstr "Pro-Plan"
-
-#: src/views/members/components/InviteMemberForm.tsx:182
-msgid "Pro Plan ∞"
-msgstr "Pro-Plan ∞"
-
-#: src/views/settings/components/Avatar.tsx:67
+#: src/views/settings/components/Avatar.tsx:26
 msgid "Profile image updated"
 msgstr "Profilbild aktualisiert"
 
-#: src/views/settings/AccountSettings.tsx:29
+#: src/views/settings/index.tsx:146
 msgid "Profile picture"
 msgstr "Profilbild"
 
@@ -1440,7 +1353,7 @@ msgstr "Remote"
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/views/members/index.tsx:148
+#: src/views/members/index.tsx:142
 msgid "Remove member"
 msgstr "Mitglied entfernen"
 
@@ -1487,12 +1400,16 @@ msgstr "Ressourcen"
 msgid "Review"
 msgstr "Überprüfung"
 
+#: src/views/settings/components/CreateAPIKeyForm.tsx:49
+msgid "Revoke"
+msgstr "Widerrufen"
+
 #: src/views/home/components/Footer.tsx:36
 #: src/views/home/components/Header.tsx:13
 msgid "Roadmap"
 msgstr "Roadmap"
 
-#: src/views/members/index.tsx:243
+#: src/views/members/index.tsx:215
 msgid "Role"
 msgstr "Rolle"
 
@@ -1501,7 +1418,6 @@ msgid "Run on your own infrastructure"
 msgstr "Auf eigener Infrastruktur betreiben"
 
 #: src/views/card/components/Comment.tsx:165
-#: src/views/settings/components/Avatar.tsx:312
 msgid "Save"
 msgstr "Speichern"
 
@@ -1541,30 +1457,15 @@ msgstr "Feedback senden"
 msgid "Senior"
 msgstr "Senior"
 
-#: src/components/SettingsLayout.tsx:82
 #: src/components/SideNavigation.tsx:78
+#: src/views/settings/index.tsx:140
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: src/views/settings/AccountSettings.tsx:25
-msgid "Settings | Account"
-msgstr "Einstellungen | Konto"
-
-#: src/views/settings/ApiSettings.tsx:18
-msgid "Settings | API"
-msgstr "Einstellungen | API"
-
-#: src/views/settings/BillingSettings.tsx:35
-msgid "Settings | Billing"
-msgstr "Einstellungen | Abrechnung"
-
-#: src/views/settings/IntegrationsSettings.tsx:69
-msgid "Settings | Integrations"
-msgstr "Einstellungen | Integrationen"
-
-#: src/views/settings/WorkspaceSettings.tsx:54
-msgid "Settings | Workspace"
-msgstr "Einstellungen | Arbeitsbereich"
+#. placeholder {0}: workspace.name ?? "Workspace"
+#: src/views/settings/index.tsx:136
+msgid "Settings | {0}"
+msgstr "Einstellungen | {0}"
 
 #: src/views/home/components/Header.tsx:100
 #: src/views/home/components/Header.tsx:138
@@ -1613,10 +1514,6 @@ msgstr "Stern auf Github"
 msgid "Success"
 msgstr "Erfolg"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:55
-msgid "Supercharge your workspace for just $29/month. Here's what you'll get:"
-msgstr "Optimiere deinen Workspace für nur $29/Monat. Das bekommst du dafür:"
-
 #: src/components/UserMenu.tsx:180
 msgid "Support"
 msgstr "Support"
@@ -1629,8 +1526,8 @@ msgstr "Unterstütze die Entwicklung des Projekts"
 msgid "System"
 msgstr "System"
 
-#: src/views/members/components/InviteMemberForm.tsx:182
-#: src/views/members/index.tsx:207
+#: src/views/members/components/InviteMemberForm.tsx:183
+#: src/views/members/index.tsx:184
 msgid "Team Plan"
 msgstr "Team-Plan"
 
@@ -1682,10 +1579,6 @@ msgstr "Sie werden keinen Zugriff mehr auf diesen Workspace haben."
 msgid "This action can't be undone."
 msgstr "Diese Aktion kann nicht rückgängig gemacht werden."
 
-#: src/views/settings/components/NewApiKeyModal.tsx:129
-msgid "This API key will only be shown once. Please save it in a secure location."
-msgstr "Dieser API-Schlüssel wird nur einmal angezeigt. Bitte speichern Sie ihn an einem sicheren Ort."
-
 #: src/views/public/board/index.tsx:151
 msgid "This board is private or does not exist"
 msgstr "Dieses Board ist privat oder existiert nicht"
@@ -1702,14 +1595,6 @@ msgstr "Dies führt zur permanenten Löschung aller mit diesem Workspace verbund
 msgid "This will result in the permanent deletion of all data associated with your account."
 msgstr "Dies führt zur permanenten Löschung aller mit deinem Konto verbundenen Daten."
 
-#: src/components/NewWorkspaceForm.tsx:284
-msgid "This workspace URL has already been taken"
-msgstr "Diese Workspace-URL ist bereits vergeben"
-
-#: src/components/NewWorkspaceForm.tsx:286
-msgid "This workspace URL is reserved"
-msgstr "Diese Workspace-URL ist reserviert"
-
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:123
 msgid "This workspace username has already been taken"
 msgstr "Dieser Workspace-Benutzername ist bereits vergeben"
@@ -1727,11 +1612,7 @@ msgstr "Menü umschalten"
 msgid "Track all card changes with detailed activity history."
 msgstr "Verfolge alle kartenänderungen mit detaillierter aktivitätshistorie."
 
-#: src/views/settings/IntegrationsSettings.tsx:73
-msgid "Trello"
-msgstr "Trello"
-
-#: src/views/settings/IntegrationsSettings.tsx:53
+#: src/views/settings/index.tsx:94
 msgid "Trello disconnected"
 msgstr "Trello getrennt"
 
@@ -1763,7 +1644,7 @@ msgstr "Checkliste kann nicht erstellt werden"
 msgid "Unable to create list"
 msgstr "Liste konnte nicht erstellt werden"
 
-#: src/components/NewWorkspaceForm.tsx:154
+#: src/components/NewWorkspaceForm.tsx:41
 msgid "Unable to create workspace"
 msgstr "Workspace konnte nicht erstellt werden"
 
@@ -1816,16 +1697,16 @@ msgstr "Checklistenelement kann nicht aktualisiert werden"
 msgid "Unable to update comment"
 msgstr "Kommentar konnte nicht aktualisiert werden"
 
-#: src/views/card/components/LabelSelector.tsx:71
+#: src/views/card/components/LabelSelector.tsx:72
 msgid "Unable to update labels"
 msgstr "Labels konnten nicht aktualisiert werden"
 
 #: src/views/board/index.tsx:133
-#: src/views/card/components/ListSelector.tsx:51
+#: src/views/card/components/ListSelector.tsx:52
 msgid "Unable to update list"
 msgstr "Liste konnte nicht aktualisiert werden"
 
-#: src/views/card/components/MemberSelector.tsx:78
+#: src/views/card/components/MemberSelector.tsx:79
 msgid "Unable to update members"
 msgstr "Mitglieder konnten nicht aktualisiert werden"
 
@@ -1862,15 +1743,10 @@ msgstr "Unbegrenzte kommentare"
 msgid "Unlimited lists"
 msgstr "Unbegrenzte listen"
 
-#: src/components/NewWorkspaceForm.tsx:329
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:64
-msgid "Unlimited members"
-msgstr "Unbegrenzte Mitglieder"
-
 #: src/views/board/components/UpdateBoardSlugForm.tsx:174
-#: src/views/settings/components/UpdateDisplayNameForm.tsx:80
-#: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:91
-#: src/views/settings/components/UpdateWorkspaceNameForm.tsx:83
+#: src/views/settings/components/UpdateDisplayNameForm.tsx:79
+#: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:90
+#: src/views/settings/components/UpdateWorkspaceNameForm.tsx:82
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:154
 msgid "Update"
 msgstr "Aktualisieren"
@@ -1896,20 +1772,11 @@ msgstr "hat den Titel aktualisiert"
 msgid "updated the title to <0>{0}</0>"
 msgstr "hat den Titel in <0>{0}</0> geändert"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:109
+#: src/views/settings/components/CustomURLConfirmation.tsx:52
 msgid "Upgrade"
 msgstr "Upgrade"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:52
-#: src/views/settings/WorkspaceSettings.tsx:89
-msgid "Upgrade to Pro"
-msgstr "Upgrade auf Pro"
-
-#: src/components/NewWorkspaceForm.tsx:369
-msgid "Upgrade to Pro ($29/month)"
-msgstr "Upgrade auf Pro ($29/Monat)"
-
-#: src/views/members/components/InviteMemberForm.tsx:224
+#: src/views/members/components/InviteMemberForm.tsx:222
 msgid "Upgrade to Team Plan"
 msgstr "Upgrade auf Team-Plan"
 
@@ -1918,17 +1785,14 @@ msgstr "Upgrade auf Team-Plan"
 msgid "Urgent"
 msgstr "Dringend"
 
-#: src/components/NewWorkspaceForm.tsx:35
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:36
 msgid "URL can only contain letters, numbers, and hyphens"
 msgstr "URL darf nur Buchstaben, Zahlen und Bindestriche enthalten"
 
-#: src/components/NewWorkspaceForm.tsx:33
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:34
 msgid "URL cannot exceed 24 characters"
 msgstr "URL darf nicht länger als 24 Zeichen sein"
 
-#: src/components/NewWorkspaceForm.tsx:31
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:32
 msgid "URL must be at least 3 characters long"
 msgstr "URL muss mindestens 3 Zeichen lang sein"
@@ -1937,11 +1801,11 @@ msgstr "URL muss mindestens 3 Zeichen lang sein"
 msgid "Use template"
 msgstr "Vorlage verwenden"
 
-#: src/views/members/index.tsx:237
+#: src/views/members/index.tsx:209
 msgid "User"
 msgstr "Benutzer"
 
-#: src/views/members/components/InviteMemberForm.tsx:72
+#: src/views/members/components/InviteMemberForm.tsx:77
 msgid "User is already a member of this workspace"
 msgstr "Benutzer ist bereits Mitglied dieses Arbeitsbereichs"
 
@@ -1949,11 +1813,11 @@ msgstr "Benutzer ist bereits Mitglied dieses Arbeitsbereichs"
 msgid "Video"
 msgstr "Video"
 
-#: src/views/settings/ApiSettings.tsx:25
+#: src/views/settings/index.tsx:262
 msgid "View and manage your API keys."
 msgstr "API-Schlüssel anzeigen und verwalten."
 
-#: src/views/settings/BillingSettings.tsx:42
+#: src/views/settings/index.tsx:201
 msgid "View and manage your billing and subscription."
 msgstr "Verwalte deine Abrechnung und dein Abonnement."
 
@@ -2005,20 +1869,15 @@ msgstr "Als Trello 2011 auf den markt kam, beeindruckte es alle mit seiner sorgf
 msgid "Why make an open source Trello?"
 msgstr "Warum ein open source Trello entwickeln?"
 
-#: src/components/SettingsLayout.tsx:39
 #: src/views/board/index.tsx:331
 msgid "Workspace"
 msgstr "Arbeitsbereich"
 
-#: src/components/NewWorkspaceForm.tsx:143
-msgid "Workspace created successfully. You can upgrade later in settings."
-msgstr "Workspace erfolgreich erstellt. Du kannst später in den Einstellungen upgraden."
-
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:26
 msgid "Workspace deleted"
 msgstr "Workspace gelöscht"
 
-#: src/views/settings/WorkspaceSettings.tsx:75
+#: src/views/settings/index.tsx:177
 msgid "Workspace description"
 msgstr "Workspace-Beschreibung"
 
@@ -2039,8 +1898,8 @@ msgstr "Workspace-Beschreibung aktualisiert"
 msgid "Workspace members"
 msgstr "Workspace-mitglieder"
 
-#: src/components/NewWorkspaceForm.tsx:259
-#: src/views/settings/WorkspaceSettings.tsx:58
+#: src/components/NewWorkspaceForm.tsx:81
+#: src/views/settings/index.tsx:158
 msgid "Workspace name"
 msgstr "Name des Workspaces"
 
@@ -2048,10 +1907,6 @@ msgstr "Name des Workspaces"
 msgid "Workspace name cannot exceed 24 characters"
 msgstr "Der Workspace-Name darf nicht länger als 24 Zeichen sein"
 
-#: src/components/NewWorkspaceForm.tsx:27
-msgid "Workspace name is required"
-msgstr "Workspace-Name ist erforderlich"
-
 #: src/views/settings/components/UpdateWorkspaceNameForm.tsx:14
 msgid "Workspace name must be at least 3 characters long"
 msgstr "Der Workspace-Name muss mindestens 3 Zeichen lang sein"
@@ -2064,14 +1919,10 @@ msgstr "Workspace-Name aktualisiert"
 msgid "Workspace slug updated"
 msgstr "Workspace-Slug aktualisiert"
 
-#: src/views/settings/WorkspaceSettings.tsx:66
+#: src/views/settings/index.tsx:167
 msgid "Workspace URL"
 msgstr "Workspace-URL"
 
-#: src/components/NewWorkspaceForm.tsx:273
-msgid "workspace-url"
-msgstr "workspace-url"
-
 #: src/views/boards/components/TemplateBoards.tsx:30
 msgid "Writing"
 msgstr "Schreiben"
@@ -2084,7 +1935,7 @@ msgstr "Jährlich"
 msgid "Yes, we offer an forever free plan for individual use. No restrictions, no paywalls, no limits."
 msgstr "Ja, wir bieten einen dauerhaft kostenlosen plan für die individuelle nutzung an. Keine einschränkungen, keine paywalls, keine limits."
 
-#: src/views/settings/AccountSettings.tsx:73
+#: src/views/settings/index.tsx:294
 msgid "You are about to change your password."
 msgstr "Sie sind dabei, Ihr Passwort zu ändern."
 
@@ -2108,10 +1959,6 @@ msgstr "Sie haben sich erfolgreich angemeldet."
 msgid "You have been signed up successfully."
 msgstr "Sie haben sich erfolgreich registriert."
 
-#: src/views/members/components/InviteMemberForm.tsx:186
-msgid "You have unlimited seats with your Pro Plan. There is no additional charge for new members!"
-msgstr "Sie haben unbegrenzte Plätze mit Ihrem Pro-Plan. Für neue Mitglieder fallen keine zusätzlichen Kosten an!"
-
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:28
 msgid "Your account has been deleted."
 msgstr "Dein Konto wurde gelöscht."
@@ -2128,15 +1975,15 @@ msgstr "Dein Anzeigename wurde aktualisiert."
 msgid "Your password has been changed."
 msgstr "Ihr Passwort wurde geändert."
 
-#: src/views/settings/components/Avatar.tsx:68
+#: src/views/settings/components/Avatar.tsx:27
 msgid "Your profile image has been updated."
 msgstr "Dein Profilbild wurde aktualisiert."
 
-#: src/views/settings/IntegrationsSettings.tsx:54
+#: src/views/settings/index.tsx:95
 msgid "Your Trello account has been disconnected."
 msgstr "Dein Trello-Konto wurde getrennt."
 
-#: src/views/settings/IntegrationsSettings.tsx:102
+#: src/views/settings/index.tsx:244
 msgid "Your Trello account is connected."
 msgstr "Dein Trello-Konto ist verbunden."
 

apps/web/src/locales/en/messages.po

@@ -40,12 +40,12 @@ msgstr "{boardCount, plural, one {Import board (1)} other {Import boards ({board
 #~ msgid "#1 Hacker News"
 #~ msgstr "#1 Hacker News"
 
-#: src/views/members/components/InviteMemberForm.tsx:92
-#: src/views/members/components/InviteMemberForm.tsx:104
+#: src/views/members/components/InviteMemberForm.tsx:91
+#: src/views/members/components/InviteMemberForm.tsx:106
 msgid "$10/month"
 msgstr "$10/month"
 
-#: src/views/members/components/InviteMemberForm.tsx:104
+#: src/views/members/components/InviteMemberForm.tsx:106
 msgid "$8/month"
 msgstr "$8/month"
 
@@ -65,10 +65,6 @@ msgstr "1 user"
 msgid "A powerful, flexible kanban app that helps you organise work, track progress, and deliver results—all in one place."
 msgstr "A powerful, flexible kanban app that helps you organise work, track progress, and deliver results—all in one place."
 
-#: src/components/SettingsLayout.tsx:33
-msgid "Account"
-msgstr "Account"
-
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:27
 msgid "Account deleted"
 msgstr "Account deleted"
@@ -111,13 +107,13 @@ msgstr "Add description... (type '/' to open commands or '@' to mention)"
 msgid "Add details..."
 msgstr "Add details..."
 
-#: src/views/card/components/LabelSelector.tsx:109
-#: src/views/card/components/LabelSelector.tsx:114
+#: src/views/card/components/LabelSelector.tsx:110
+#: src/views/card/components/LabelSelector.tsx:118
 msgid "Add label"
 msgstr "Add label"
 
 #: src/views/card/components/MemberSelector.tsx:130
-#: src/views/members/components/InviteMemberForm.tsx:147
+#: src/views/members/components/InviteMemberForm.tsx:149
 msgid "Add member"
 msgstr "Add member"
 
@@ -156,14 +152,10 @@ msgstr "added label <0>{0}</0>"
 #~ msgid "added label <0>{label}</0>"
 #~ msgstr "added label <0>{label}</0>"
 
-#: src/views/members/components/InviteMemberForm.tsx:187
+#: src/views/members/components/InviteMemberForm.tsx:186
 msgid "Adding a new member will cost an additional {price} ({billingType}) per seat."
 msgstr "Adding a new member will cost an additional {price} ({billingType}) per seat."
 
-#: src/views/settings/components/Avatar.tsx:278
-msgid "Adjust the square crop to fit your avatar."
-msgstr "Adjust the square crop to fit your avatar."
-
 #: src/views/home/components/Pricing.tsx:55
 msgid "Admin roles"
 msgstr "Admin roles"
@@ -180,7 +172,7 @@ msgstr "All systems operational"
 msgid "Already have an account? <0><1>Sign in</1></0>"
 msgstr "Already have an account? <0><1>Sign in</1></0>"
 
-#: src/views/settings/IntegrationsSettings.tsx:61
+#: src/views/settings/index.tsx:102
 msgid "An error occurred while disconnecting your Trello account."
 msgstr "An error occurred while disconnecting your Trello account."
 
@@ -188,27 +180,7 @@ msgstr "An error occurred while disconnecting your Trello account."
 msgid "An unexpected error occurred. Please try again later."
 msgstr "An unexpected error occurred. Please try again later."
 
-#: src/components/SettingsLayout.tsx:51
-msgid "API"
-msgstr "API"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:91
-msgid "API key created"
-msgstr "API key created"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:161
-msgid "API key name"
-msgstr "API key name"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:25
-msgid "API key name cannot exceed 30 characters"
-msgstr "API key name cannot exceed 30 characters"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:24
-msgid "API key name is required"
-msgstr "API key name is required"
-
-#: src/views/settings/ApiSettings.tsx:22
+#: src/views/settings/index.tsx:259
 msgid "API keys"
 msgstr "API keys"
 
@@ -282,21 +254,20 @@ msgstr "Backlog"
 msgid "Basic Kanban"
 msgstr "Basic Kanban"
 
-#: src/views/members/components/InviteMemberForm.tsx:105
+#: src/views/members/components/InviteMemberForm.tsx:107
 msgid "billed annually"
 msgstr "billed annually"
 
-#: src/views/members/components/InviteMemberForm.tsx:105
+#: src/views/members/components/InviteMemberForm.tsx:107
 msgid "billed monthly"
 msgstr "billed monthly"
 
-#: src/components/SettingsLayout.tsx:44
 #: src/views/boards/components/TemplateBoards.tsx:55
-#: src/views/settings/BillingSettings.tsx:39
+#: src/views/settings/index.tsx:198
 msgid "Billing"
 msgstr "Billing"
 
-#: src/views/settings/BillingSettings.tsx:49
+#: src/views/settings/index.tsx:208
 msgid "Billing portal"
 msgstr "Billing portal"
 
@@ -308,16 +279,6 @@ msgstr "Blog Post"
 msgid "Board"
 msgstr "Board"
 
-#: src/components/NewWorkspaceForm.tsx:346
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:81
-msgid "Board analytics"
-msgstr "Board analytics"
-
-#: src/components/NewWorkspaceForm.tsx:310
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:80
-#~ msgid "Board analytics (coming soon)"
-#~ msgstr "Board analytics (coming soon)"
-
 #: src/views/boards/components/NewBoardForm.tsx:21
 msgid "Board name cannot exceed 100 characters"
 msgstr "Board name cannot exceed 100 characters"
@@ -360,12 +321,12 @@ msgid "Board visibility updated"
 msgstr "Board visibility updated"
 
 #: src/components/SideNavigation.tsx:68
-#: src/views/boards/index.tsx:32
+#: src/views/boards/index.tsx:27
 msgid "Boards"
 msgstr "Boards"
 
 #. placeholder {0}: workspace.name ?? "Workspace"
-#: src/views/boards/index.tsx:28
+#: src/views/boards/index.tsx:23
 msgid "Boards | {0}"
 msgstr "Boards | {0}"
 
@@ -391,11 +352,10 @@ msgstr "Bug Report"
 #: src/views/card/components/DeleteChecklistConfirmation.tsx:63
 #: src/views/card/components/DeleteCommentConfirmation.tsx:76
 #: src/views/members/components/DeleteMemberConfirmation.tsx:55
-#: src/views/settings/components/Avatar.tsx:309
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:168
+#: src/views/settings/components/CustomURLConfirmation.tsx:50
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:88
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:98
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:104
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -407,20 +367,16 @@ msgstr "Card not found"
 msgid "Card title"
 msgstr "Card title"
 
-#: src/views/settings/AccountSettings.tsx:70
-#: src/views/settings/AccountSettings.tsx:80
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:109
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:178
+#: src/views/settings/index.tsx:291
+#: src/views/settings/index.tsx:301
 msgid "Change Password"
 msgstr "Change Password"
 
-#: src/views/settings/index.tsx:227
-#~ msgid "Change the language of the app."
-#~ msgstr "Change the language of the app."
-
-#: src/views/settings/AccountSettings.tsx:45
-msgid "Change your language preferences."
-msgstr "Change your language preferences."
+#: src/views/settings/index.tsx:190
+msgid "Change the language of the app."
+msgstr "Change the language of the app."
 
 #: src/views/auth/login/index.tsx:41
 #: src/views/auth/signup/index.tsx:67
@@ -440,10 +396,6 @@ msgstr "Clear filters"
 msgid "Click on the link we've sent to {magicLinkRecipient} to sign in."
 msgstr "Click on the link we've sent to {magicLinkRecipient} to sign in."
 
-#: src/views/settings/components/NewApiKeyModal.tsx:136
-msgid "Close"
-msgstr "Close"
-
 #: src/views/boards/components/TemplateBoards.tsx:22
 msgid "Code Review"
 msgstr "Code Review"
@@ -452,9 +404,7 @@ msgstr "Code Review"
 msgid "Collaborate seamlessly with your team."
 msgstr "Collaborate seamlessly with your team."
 
-#: src/components/NewWorkspaceForm.tsx:349
 #: src/views/home/components/Features.tsx:66
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:84
 msgid "Coming soon"
 msgstr "Coming soon"
 
@@ -483,16 +433,16 @@ msgstr "completed a checklist item"
 msgid "completed checklist item <0>{0}</0>"
 msgstr "completed checklist item <0>{0}</0>"
 
-#: src/views/settings/components/CustomURLConfirmation.tsx:47
-#~ msgid "Confirm URL change"
-#~ msgstr "Confirm URL change"
+#: src/views/settings/components/CustomURLConfirmation.tsx:42
+msgid "Confirm URL change"
+msgstr "Confirm URL change"
 
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:150
 msgid "Confirm your new password"
 msgstr "Confirm your new password"
 
 #: src/views/boards/components/ImportBoardsForm.tsx:157
-#: src/views/settings/IntegrationsSettings.tsx:93
+#: src/views/settings/index.tsx:235
 msgid "Connect Trello"
 msgstr "Connect Trello"
 
@@ -500,7 +450,7 @@ msgstr "Connect Trello"
 msgid "Connect your favorite tools to streamline your workflow."
 msgstr "Connect your favorite tools to streamline your workflow."
 
-#: src/views/settings/IntegrationsSettings.tsx:80
+#: src/views/settings/index.tsx:222
 msgid "Connect your Trello account to import boards."
 msgstr "Connect your Trello account to import boards."
 
@@ -535,9 +485,9 @@ msgstr "Control who can view and edit your boards."
 msgid "Create another"
 msgstr "Create another"
 
-#: src/views/settings/components/NewApiKeyModal.tsx:175
-msgid "Create API key"
-msgstr "Create API key"
+#: src/views/settings/index.tsx:238
+#~ msgid "Create API key"
+#~ msgstr "Create API key"
 
 #: src/views/settings/index.tsx:232
 #~ msgid "Create API keys to access the Kan API."
@@ -567,12 +517,12 @@ msgstr "Create list"
 msgid "Create new board"
 msgstr "Create new board"
 
-#: src/views/settings/ApiSettings.tsx:30
+#: src/views/settings/components/CreateAPIKeyForm.tsx:54
 msgid "Create new key"
 msgstr "Create new key"
 
 #: src/views/board/components/NewCardForm.tsx:394
-#: src/views/card/components/LabelSelector.tsx:97
+#: src/views/card/components/LabelSelector.tsx:98
 msgid "Create new label"
 msgstr "Create new label"
 
@@ -580,11 +530,7 @@ msgstr "Create new label"
 msgid "Create new list"
 msgstr "Create new list"
 
-#: src/components/NewWorkspaceForm.tsx:337
-#~ msgid "Create Pro workspace"
-#~ msgstr "Create Pro workspace"
-
-#: src/components/NewWorkspaceForm.tsx:384
+#: src/components/NewWorkspaceForm.tsx:94
 #: src/components/WorkspaceMenu.tsx:116
 msgid "Create workspace"
 msgstr "Create workspace"
@@ -597,10 +543,6 @@ msgstr "created the card"
 msgid "Critical"
 msgstr "Critical"
 
-#: src/views/settings/components/Avatar.tsx:275
-msgid "Crop your avatar"
-msgstr "Crop your avatar"
-
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:19
 msgid "Current password is required"
 msgstr "Current password is required"
@@ -609,22 +551,9 @@ msgstr "Current password is required"
 msgid "Custom domain"
 msgstr "Custom domain"
 
-#: src/views/settings/components/CustomURLConfirmation.tsx:50
-#~ msgid "Custom URLs are a premium feature. You'll be directed to upgrade your account."
-#~ msgstr "Custom URLs are a premium feature. You'll be directed to upgrade your account."
-
-#: src/components/NewWorkspaceForm.tsx:280
-#~ msgid "Custom URLs require Pro plan ($29/month)"
-#~ msgstr "Custom URLs require Pro plan ($29/month)"
-
-#: src/components/NewWorkspaceForm.tsx:315
-msgid "Custom URLs require upgrading to a Pro plan"
-msgstr "Custom URLs require upgrading to a Pro plan"
-
-#: src/components/NewWorkspaceForm.tsx:339
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:74
-msgid "Custom workspace URL"
-msgstr "Custom workspace URL"
+#: src/views/settings/components/CustomURLConfirmation.tsx:45
+msgid "Custom URLs are a premium feature. You'll be directed to upgrade your account."
+msgstr "Custom URLs are a premium feature. You'll be directed to upgrade your account."
 
 #: src/views/boards/components/TemplateBoards.tsx:41
 msgid "Customer Support"
@@ -642,9 +571,9 @@ msgstr "Dark"
 msgid "Delete"
 msgstr "Delete"
 
-#: src/views/settings/AccountSettings.tsx:52
-#: src/views/settings/AccountSettings.tsx:62
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:96
+#: src/views/settings/index.tsx:309
+#: src/views/settings/index.tsx:319
 msgid "Delete account"
 msgstr "Delete account"
 
@@ -665,8 +594,8 @@ msgid "Delete list"
 msgstr "Delete list"
 
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:106
-#: src/views/settings/WorkspaceSettings.tsx:96
-#: src/views/settings/WorkspaceSettings.tsx:107
+#: src/views/settings/index.tsx:272
+#: src/views/settings/index.tsx:283
 msgid "Delete workspace"
 msgstr "Delete workspace"
 
@@ -692,7 +621,7 @@ msgstr "deleted checklist item <0>{0}</0>"
 msgid "Design"
 msgstr "Design"
 
-#: src/views/settings/IntegrationsSettings.tsx:108
+#: src/views/settings/index.tsx:250
 msgid "Disconnect Trello"
 msgstr "Disconnect Trello"
 
@@ -700,7 +629,7 @@ msgstr "Disconnect Trello"
 msgid "Discuss and collaborate on cards."
 msgstr "Discuss and collaborate on cards."
 
-#: src/views/settings/AccountSettings.tsx:35
+#: src/views/settings/index.tsx:151
 msgid "Display name"
 msgstr "Display name"
 
@@ -770,7 +699,7 @@ msgstr "Editing"
 msgid "email"
 msgstr "email"
 
-#: src/views/members/components/InviteMemberForm.tsx:161
+#: src/views/members/components/InviteMemberForm.tsx:163
 msgid "Email"
 msgstr "Email"
 
@@ -818,12 +747,12 @@ msgstr "Error deleting label"
 msgid "Error deleting workspace"
 msgstr "Error deleting workspace"
 
-#: src/views/settings/IntegrationsSettings.tsx:60
+#: src/views/settings/index.tsx:101
 msgid "Error disconnecting Trello"
 msgstr "Error disconnecting Trello"
 
-#: src/views/members/components/InviteMemberForm.tsx:71
-#: src/views/members/components/InviteMemberForm.tsx:77
+#: src/views/members/components/InviteMemberForm.tsx:76
+#: src/views/members/components/InviteMemberForm.tsx:82
 msgid "Error inviting member"
 msgstr "Error inviting member"
 
@@ -831,7 +760,7 @@ msgstr "Error inviting member"
 msgid "Error updating display name"
 msgstr "Error updating display name"
 
-#: src/views/settings/components/Avatar.tsx:80
+#: src/views/settings/components/Avatar.tsx:39
 msgid "Error updating profile image"
 msgstr "Error updating profile image"
 
@@ -847,17 +776,12 @@ msgstr "Error updating workspace name"
 msgid "Error updating workspace URL"
 msgstr "Error updating workspace URL"
 
-#: src/views/members/components/InviteMemberForm.tsx:130
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:41
+#: src/views/members/components/InviteMemberForm.tsx:132
 msgid "Error upgrading subscription"
 msgstr "Error upgrading subscription"
 
-#: src/components/NewWorkspaceForm.tsx:142
-msgid "Error upgrading to Pro"
-msgstr "Error upgrading to Pro"
-
-#: src/views/settings/components/Avatar.tsx:94
-#: src/views/settings/components/Avatar.tsx:221
+#: src/views/settings/components/Avatar.tsx:56
+#: src/views/settings/components/Avatar.tsx:97
 msgid "Error uploading profile image"
 msgstr "Error uploading profile image"
 
@@ -923,8 +847,8 @@ msgstr "For long-term sustainability, we recognise all good open source projects
 msgid "Free"
 msgstr "Free"
 
-#: src/views/members/components/InviteMemberForm.tsx:193
-#: src/views/members/index.tsx:208
+#: src/views/members/components/InviteMemberForm.tsx:192
+#: src/views/members/index.tsx:184
 msgid "Free Plan"
 msgstr "Free Plan"
 
@@ -1037,7 +961,7 @@ msgstr "Ideas to improve this page..."
 #~ msgid "Ideas, Research, Planning, Execution, Review, Next Steps, Complete"
 #~ msgstr "Ideas, Research, Planning, Execution, Review, Next Steps, Complete"
 
-#: src/views/boards/index.tsx:43
+#: src/views/boards/index.tsx:38
 msgid "Import"
 msgstr "Import"
 
@@ -1075,7 +999,6 @@ msgstr "In Progress"
 msgid "Individuals"
 msgstr "Individuals"
 
-#: src/components/SettingsLayout.tsx:57
 #: src/views/home/components/Features.tsx:114
 msgid "Integrations"
 msgstr "Integrations"
@@ -1084,24 +1007,24 @@ msgstr "Integrations"
 msgid "Interviewing"
 msgstr "Interviewing"
 
-#: src/views/members/components/InviteMemberForm.tsx:40
+#: src/views/members/components/InviteMemberForm.tsx:45
 msgid "Invalid email address"
 msgstr "Invalid email address"
 
-#: src/views/members/index.tsx:221
+#: src/views/members/index.tsx:193
 msgid "Invite"
 msgstr "Invite"
 
-#: src/views/members/components/InviteMemberForm.tsx:208
+#: src/views/members/components/InviteMemberForm.tsx:207
 msgid "Invite another"
 msgstr "Invite another"
 
-#: src/views/card/components/MemberSelector.tsx:111
-#: src/views/members/components/InviteMemberForm.tsx:233
+#: src/views/card/components/MemberSelector.tsx:112
+#: src/views/members/components/InviteMemberForm.tsx:231
 msgid "Invite member"
 msgstr "Invite member"
 
-#: src/views/members/components/InviteMemberForm.tsx:196
+#: src/views/members/components/InviteMemberForm.tsx:195
 msgid "Inviting members requires a Team Plan. You'll be redirected to upgrade your workspace."
 msgstr "Inviting members requires a Team Plan. You'll be redirected to upgrade your workspace."
 
@@ -1132,23 +1055,10 @@ msgstr "Labels"
 msgid "Labels & Filters"
 msgstr "Labels & Filters"
 
-#: src/views/settings/AccountSettings.tsx:42
+#: src/views/settings/index.tsx:187
 msgid "Language"
 msgstr "Language"
 
-#: src/components/NewWorkspaceForm.tsx:332
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:67
-msgid "Launch offer"
-msgstr "Launch offer"
-
-#: src/views/members/index.tsx:191
-msgid "Launch offer: Get unlimited members with Pro"
-msgstr "Launch offer: Get unlimited members with Pro"
-
-#: src/views/home/components/Pricing.tsx:99
-msgid "Launch offer: unlimited seats for just $29/month with Pro"
-msgstr "Launch offer: unlimited seats for just $29/month with Pro"
-
 #: src/views/boards/components/TemplateBoards.tsx:83
 msgid "Learning"
 msgstr "Learning"
@@ -1214,12 +1124,12 @@ msgstr "Medium Priority"
 #: src/views/board/components/Filters.tsx:93
 #: src/views/board/components/NewCardForm.tsx:357
 #: src/views/card/index.tsx:125
-#: src/views/members/index.tsx:178
+#: src/views/members/index.tsx:171
 msgid "Members"
 msgstr "Members"
 
 #. placeholder {0}: workspace.name ?? "Workspace"
-#: src/views/members/index.tsx:173
+#: src/views/members/index.tsx:167
 msgid "Members | {0}"
 msgstr "Members | {0}"
 
@@ -1227,7 +1137,7 @@ msgstr "Members | {0}"
 msgid "Monthly"
 msgstr "Monthly"
 
-#: src/views/members/components/InviteMemberForm.tsx:93
+#: src/views/members/components/InviteMemberForm.tsx:92
 msgid "monthly billing"
 msgstr "monthly billing"
 
@@ -1245,10 +1155,6 @@ msgstr "moved the card from <0>{0}</0> to<1>{1}</1>"
 msgid "moved the card to another list"
 msgstr "moved the card to another list"
 
-#: src/components/NewWorkspaceForm.tsx:273
-#~ msgid "my-workspace-name"
-#~ msgstr "my-workspace-name"
-
 #: src/components/LabelForm.tsx:135
 #: src/views/boards/components/NewBoardForm.tsx:99
 msgid "Name"
@@ -1258,14 +1164,10 @@ msgstr "Name"
 msgid "Need help?"
 msgstr "Need help?"
 
-#: src/views/boards/index.tsx:53
+#: src/views/boards/index.tsx:48
 msgid "New"
 msgstr "New"
 
-#: src/views/settings/components/NewApiKeyModal.tsx:147
-msgid "New API key"
-msgstr "New API key"
-
 #: src/views/boards/components/NewBoardForm.tsx:85
 msgid "New board"
 msgstr "New board"
@@ -1307,7 +1209,7 @@ msgstr "New Ticket"
 #~ msgid "New Ticket, Triaging, In Progress, Awaiting Customer, Resolution, Done"
 #~ msgstr "New Ticket, Triaging, In Progress, Awaiting Customer, Resolution, Done"
 
-#: src/components/NewWorkspaceForm.tsx:240
+#: src/components/NewWorkspaceForm.tsx:65
 msgid "New workspace"
 msgstr "New workspace"
 
@@ -1343,11 +1245,11 @@ msgstr "Offer"
 msgid "Onboarding"
 msgstr "Onboarding"
 
-#: src/views/settings/AccountSettings.tsx:55
+#: src/views/settings/index.tsx:312
 msgid "Once you delete your account, there is no going back. This action cannot be undone."
 msgstr "Once you delete your account, there is no going back. This action cannot be undone."
 
-#: src/views/settings/WorkspaceSettings.tsx:99
+#: src/views/settings/index.tsx:275
 msgid "Once you delete your workspace, there is no going back. This action cannot be undone."
 msgstr "Once you delete your workspace, there is no going back. This action cannot be undone."
 
@@ -1379,15 +1281,11 @@ msgstr "Password must be at least 8 characters"
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: src/views/members/index.tsx:134
-msgid "Paused"
-msgstr "Paused"
-
-#: src/views/home/components/Pricing.tsx:102
+#: src/views/home/components/Pricing.tsx:96
 msgid "Payment frequency"
 msgstr "Payment frequency"
 
-#: src/views/members/index.tsx:134
+#: src/views/members/index.tsx:128
 msgid "Pending"
 msgstr "Pending"
 
@@ -1420,13 +1318,13 @@ msgstr "Please enter a valid name"
 msgid "Please enter a valid password"
 msgstr "Please enter a valid password"
 
-#: src/views/settings/components/Avatar.tsx:95
+#: src/views/settings/components/Avatar.tsx:57
 msgid "Please select a file to upload."
 msgstr "Please select a file to upload."
 
 #: src/components/DeleteLabelConfirmation.tsx:26
 #: src/components/FeedbackModal.tsx:41
-#: src/components/NewWorkspaceForm.tsx:155
+#: src/components/NewWorkspaceForm.tsx:42
 #: src/views/board/components/NewCardForm.tsx:174
 #: src/views/board/components/NewListForm.tsx:78
 #: src/views/board/components/UpdateBoardSlugForm.tsx:72
@@ -1441,25 +1339,24 @@ msgstr "Please select a file to upload."
 #: src/views/card/components/DeleteCardConfirmation.tsx:52
 #: src/views/card/components/DeleteChecklistConfirmation.tsx:37
 #: src/views/card/components/DeleteCommentConfirmation.tsx:45
-#: src/views/card/components/LabelSelector.tsx:72
-#: src/views/card/components/ListSelector.tsx:52
-#: src/views/card/components/MemberSelector.tsx:79
+#: src/views/card/components/LabelSelector.tsx:73
+#: src/views/card/components/ListSelector.tsx:53
+#: src/views/card/components/MemberSelector.tsx:80
 #: src/views/card/components/NewChecklistForm.tsx:70
 #: src/views/card/components/NewChecklistItemForm.tsx:89
 #: src/views/card/components/NewCommentForm.tsx:31
 #: src/views/card/index.tsx:173
 #: src/views/members/components/DeleteMemberConfirmation.tsx:28
-#: src/views/members/components/InviteMemberForm.tsx:78
-#: src/views/members/components/InviteMemberForm.tsx:131
-#: src/views/settings/components/Avatar.tsx:81
-#: src/views/settings/components/Avatar.tsx:222
+#: src/views/members/components/InviteMemberForm.tsx:83
+#: src/views/members/components/InviteMemberForm.tsx:133
+#: src/views/settings/components/Avatar.tsx:40
+#: src/views/settings/components/Avatar.tsx:98
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:40
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:46
 #: src/views/settings/components/UpdateDisplayNameForm.tsx:55
 #: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:62
 #: src/views/settings/components/UpdateWorkspaceNameForm.tsx:57
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:74
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:42
 msgid "Please try again later, or contact customer support."
 msgstr "Please try again later, or contact customer support."
 
@@ -1470,7 +1367,6 @@ msgid "Pricing"
 msgstr "Pricing"
 
 #: src/views/home/components/Pricing.tsx:56
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:91
 msgid "Priority email support"
 msgstr "Priority email support"
 
@@ -1482,19 +1378,11 @@ msgstr "Privacy policy"
 msgid "Private"
 msgstr "Private"
 
-#: src/views/members/index.tsx:205
-msgid "Pro Plan"
-msgstr "Pro Plan"
-
-#: src/views/members/components/InviteMemberForm.tsx:182
-msgid "Pro Plan ∞"
-msgstr "Pro Plan ∞"
-
-#: src/views/settings/components/Avatar.tsx:67
+#: src/views/settings/components/Avatar.tsx:26
 msgid "Profile image updated"
 msgstr "Profile image updated"
 
-#: src/views/settings/AccountSettings.tsx:29
+#: src/views/settings/index.tsx:146
 msgid "Profile picture"
 msgstr "Profile picture"
 
@@ -1530,7 +1418,7 @@ msgstr "Remote"
 msgid "Remove"
 msgstr "Remove"
 
-#: src/views/members/index.tsx:148
+#: src/views/members/index.tsx:142
 msgid "Remove member"
 msgstr "Remove member"
 
@@ -1582,15 +1470,15 @@ msgid "Review"
 msgstr "Review"
 
 #: src/views/settings/components/CreateAPIKeyForm.tsx:49
-#~ msgid "Revoke"
-#~ msgstr "Revoke"
+msgid "Revoke"
+msgstr "Revoke"
 
 #: src/views/home/components/Footer.tsx:36
 #: src/views/home/components/Header.tsx:13
 msgid "Roadmap"
 msgstr "Roadmap"
 
-#: src/views/members/index.tsx:243
+#: src/views/members/index.tsx:215
 msgid "Role"
 msgstr "Role"
 
@@ -1599,7 +1487,6 @@ msgid "Run on your own infrastructure"
 msgstr "Run on your own infrastructure"
 
 #: src/views/card/components/Comment.tsx:165
-#: src/views/settings/components/Avatar.tsx:312
 msgid "Save"
 msgstr "Save"
 
@@ -1643,34 +1530,15 @@ msgstr "Send feedback"
 msgid "Senior"
 msgstr "Senior"
 
-#: src/components/SettingsLayout.tsx:82
 #: src/components/SideNavigation.tsx:78
+#: src/views/settings/index.tsx:140
 msgid "Settings"
 msgstr "Settings"
 
-#: src/views/settings/index.tsx:161
-#~ msgid "Settings | {0}"
-#~ msgstr "Settings | {0}"
-
-#: src/views/settings/AccountSettings.tsx:25
-msgid "Settings | Account"
-msgstr "Settings | Account"
-
-#: src/views/settings/ApiSettings.tsx:18
-msgid "Settings | API"
-msgstr "Settings | API"
-
-#: src/views/settings/BillingSettings.tsx:35
-msgid "Settings | Billing"
-msgstr "Settings | Billing"
-
-#: src/views/settings/IntegrationsSettings.tsx:69
-msgid "Settings | Integrations"
-msgstr "Settings | Integrations"
-
-#: src/views/settings/WorkspaceSettings.tsx:54
-msgid "Settings | Workspace"
-msgstr "Settings | Workspace"
+#. placeholder {0}: workspace.name ?? "Workspace"
+#: src/views/settings/index.tsx:136
+msgid "Settings | {0}"
+msgstr "Settings | {0}"
 
 #: src/views/home/components/Header.tsx:100
 #: src/views/home/components/Header.tsx:138
@@ -1719,10 +1587,6 @@ msgstr "Star on Github"
 msgid "Success"
 msgstr "Success"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:55
-msgid "Supercharge your workspace for just $29/month. Here's what you'll get:"
-msgstr "Supercharge your workspace for just $29/month. Here's what you'll get:"
-
 #: src/components/UserMenu.tsx:180
 msgid "Support"
 msgstr "Support"
@@ -1735,8 +1599,8 @@ msgstr "Support the development of the project"
 msgid "System"
 msgstr "System"
 
-#: src/views/members/components/InviteMemberForm.tsx:182
-#: src/views/members/index.tsx:207
+#: src/views/members/components/InviteMemberForm.tsx:183
+#: src/views/members/index.tsx:184
 msgid "Team Plan"
 msgstr "Team Plan"
 
@@ -1788,10 +1652,6 @@ msgstr "They won't be able to access this workspace."
 msgid "This action can't be undone."
 msgstr "This action can't be undone."
 
-#: src/views/settings/components/NewApiKeyModal.tsx:129
-msgid "This API key will only be shown once. Please save it in a secure location."
-msgstr "This API key will only be shown once. Please save it in a secure location."
-
 #: src/views/public/board/index.tsx:151
 msgid "This board is private or does not exist"
 msgstr "This board is private or does not exist"
@@ -1808,14 +1668,6 @@ msgstr "This will result in the permanent deletion of all data associated with t
 msgid "This will result in the permanent deletion of all data associated with your account."
 msgstr "This will result in the permanent deletion of all data associated with your account."
 
-#: src/components/NewWorkspaceForm.tsx:284
-msgid "This workspace URL has already been taken"
-msgstr "This workspace URL has already been taken"
-
-#: src/components/NewWorkspaceForm.tsx:286
-msgid "This workspace URL is reserved"
-msgstr "This workspace URL is reserved"
-
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:123
 msgid "This workspace username has already been taken"
 msgstr "This workspace username has already been taken"
@@ -1837,11 +1689,7 @@ msgstr "Toggle menu"
 msgid "Track all card changes with detailed activity history."
 msgstr "Track all card changes with detailed activity history."
 
-#: src/views/settings/IntegrationsSettings.tsx:73
-msgid "Trello"
-msgstr "Trello"
-
-#: src/views/settings/IntegrationsSettings.tsx:53
+#: src/views/settings/index.tsx:94
 msgid "Trello disconnected"
 msgstr "Trello disconnected"
 
@@ -1873,7 +1721,7 @@ msgstr "Unable to create checklist"
 msgid "Unable to create list"
 msgstr "Unable to create list"
 
-#: src/components/NewWorkspaceForm.tsx:154
+#: src/components/NewWorkspaceForm.tsx:41
 msgid "Unable to create workspace"
 msgstr "Unable to create workspace"
 
@@ -1926,16 +1774,16 @@ msgstr "Unable to update checklist item"
 msgid "Unable to update comment"
 msgstr "Unable to update comment"
 
-#: src/views/card/components/LabelSelector.tsx:71
+#: src/views/card/components/LabelSelector.tsx:72
 msgid "Unable to update labels"
 msgstr "Unable to update labels"
 
 #: src/views/board/index.tsx:133
-#: src/views/card/components/ListSelector.tsx:51
+#: src/views/card/components/ListSelector.tsx:52
 msgid "Unable to update list"
 msgstr "Unable to update list"
 
-#: src/views/card/components/MemberSelector.tsx:78
+#: src/views/card/components/MemberSelector.tsx:79
 msgid "Unable to update members"
 msgstr "Unable to update members"
 
@@ -1976,15 +1824,10 @@ msgstr "Unlimited comments"
 msgid "Unlimited lists"
 msgstr "Unlimited lists"
 
-#: src/components/NewWorkspaceForm.tsx:329
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:64
-msgid "Unlimited members"
-msgstr "Unlimited members"
-
 #: src/views/board/components/UpdateBoardSlugForm.tsx:174
-#: src/views/settings/components/UpdateDisplayNameForm.tsx:80
-#: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:91
-#: src/views/settings/components/UpdateWorkspaceNameForm.tsx:83
+#: src/views/settings/components/UpdateDisplayNameForm.tsx:79
+#: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:90
+#: src/views/settings/components/UpdateWorkspaceNameForm.tsx:82
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:154
 msgid "Update"
 msgstr "Update"
@@ -2014,20 +1857,11 @@ msgstr "updated the title to <0>{0}</0>"
 #~ msgid "updated the title to <0>{toTitle}</0>"
 #~ msgstr "updated the title to <0>{toTitle}</0>"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:109
+#: src/views/settings/components/CustomURLConfirmation.tsx:52
 msgid "Upgrade"
 msgstr "Upgrade"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:52
-#: src/views/settings/WorkspaceSettings.tsx:89
-msgid "Upgrade to Pro"
-msgstr "Upgrade to Pro"
-
-#: src/components/NewWorkspaceForm.tsx:369
-msgid "Upgrade to Pro ($29/month)"
-msgstr "Upgrade to Pro ($29/month)"
-
-#: src/views/members/components/InviteMemberForm.tsx:224
+#: src/views/members/components/InviteMemberForm.tsx:222
 msgid "Upgrade to Team Plan"
 msgstr "Upgrade to Team Plan"
 
@@ -2036,17 +1870,14 @@ msgstr "Upgrade to Team Plan"
 msgid "Urgent"
 msgstr "Urgent"
 
-#: src/components/NewWorkspaceForm.tsx:35
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:36
 msgid "URL can only contain letters, numbers, and hyphens"
 msgstr "URL can only contain letters, numbers, and hyphens"
 
-#: src/components/NewWorkspaceForm.tsx:33
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:34
 msgid "URL cannot exceed 24 characters"
 msgstr "URL cannot exceed 24 characters"
 
-#: src/components/NewWorkspaceForm.tsx:31
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:32
 msgid "URL must be at least 3 characters long"
 msgstr "URL must be at least 3 characters long"
@@ -2055,11 +1886,11 @@ msgstr "URL must be at least 3 characters long"
 msgid "Use template"
 msgstr "Use template"
 
-#: src/views/members/index.tsx:237
+#: src/views/members/index.tsx:209
 msgid "User"
 msgstr "User"
 
-#: src/views/members/components/InviteMemberForm.tsx:72
+#: src/views/members/components/InviteMemberForm.tsx:77
 msgid "User is already a member of this workspace"
 msgstr "User is already a member of this workspace"
 
@@ -2067,11 +1898,11 @@ msgstr "User is already a member of this workspace"
 msgid "Video"
 msgstr "Video"
 
-#: src/views/settings/ApiSettings.tsx:25
+#: src/views/settings/index.tsx:262
 msgid "View and manage your API keys."
 msgstr "View and manage your API keys."
 
-#: src/views/settings/BillingSettings.tsx:42
+#: src/views/settings/index.tsx:201
 msgid "View and manage your billing and subscription."
 msgstr "View and manage your billing and subscription."
 
@@ -2127,20 +1958,15 @@ msgstr "When Trello launched in 2011, it blew everyone away with its carefully d
 msgid "Why make an open source Trello?"
 msgstr "Why make an open source Trello?"
 
-#: src/components/SettingsLayout.tsx:39
 #: src/views/board/index.tsx:331
 msgid "Workspace"
 msgstr "Workspace"
 
-#: src/components/NewWorkspaceForm.tsx:143
-msgid "Workspace created successfully. You can upgrade later in settings."
-msgstr "Workspace created successfully. You can upgrade later in settings."
-
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:26
 msgid "Workspace deleted"
 msgstr "Workspace deleted"
 
-#: src/views/settings/WorkspaceSettings.tsx:75
+#: src/views/settings/index.tsx:177
 msgid "Workspace description"
 msgstr "Workspace description"
 
@@ -2161,8 +1987,8 @@ msgstr "Workspace description updated"
 msgid "Workspace members"
 msgstr "Workspace members"
 
-#: src/components/NewWorkspaceForm.tsx:259
-#: src/views/settings/WorkspaceSettings.tsx:58
+#: src/components/NewWorkspaceForm.tsx:81
+#: src/views/settings/index.tsx:158
 msgid "Workspace name"
 msgstr "Workspace name"
 
@@ -2170,10 +1996,6 @@ msgstr "Workspace name"
 msgid "Workspace name cannot exceed 24 characters"
 msgstr "Workspace name cannot exceed 24 characters"
 
-#: src/components/NewWorkspaceForm.tsx:27
-msgid "Workspace name is required"
-msgstr "Workspace name is required"
-
 #: src/views/settings/components/UpdateWorkspaceNameForm.tsx:14
 msgid "Workspace name must be at least 3 characters long"
 msgstr "Workspace name must be at least 3 characters long"
@@ -2186,14 +2008,10 @@ msgstr "Workspace name updated"
 msgid "Workspace slug updated"
 msgstr "Workspace slug updated"
 
-#: src/views/settings/WorkspaceSettings.tsx:66
+#: src/views/settings/index.tsx:167
 msgid "Workspace URL"
 msgstr "Workspace URL"
 
-#: src/components/NewWorkspaceForm.tsx:273
-msgid "workspace-url"
-msgstr "workspace-url"
-
 #: src/views/boards/components/TemplateBoards.tsx:30
 msgid "Writing"
 msgstr "Writing"
@@ -2206,7 +2024,7 @@ msgstr "Yearly"
 msgid "Yes, we offer an forever free plan for individual use. No restrictions, no paywalls, no limits."
 msgstr "Yes, we offer an forever free plan for individual use. No restrictions, no paywalls, no limits."
 
-#: src/views/settings/AccountSettings.tsx:73
+#: src/views/settings/index.tsx:294
 msgid "You are about to change your password."
 msgstr "You are about to change your password."
 
@@ -2230,10 +2048,6 @@ msgstr "You have been logged in successfully."
 msgid "You have been signed up successfully."
 msgstr "You have been signed up successfully."
 
-#: src/views/members/components/InviteMemberForm.tsx:186
-msgid "You have unlimited seats with your Pro Plan. There is no additional charge for new members!"
-msgstr "You have unlimited seats with your Pro Plan. There is no additional charge for new members!"
-
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:28
 msgid "Your account has been deleted."
 msgstr "Your account has been deleted."
@@ -2250,15 +2064,15 @@ msgstr "Your display name has been updated."
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: src/views/settings/components/Avatar.tsx:68
+#: src/views/settings/components/Avatar.tsx:27
 msgid "Your profile image has been updated."
 msgstr "Your profile image has been updated."
 
-#: src/views/settings/IntegrationsSettings.tsx:54
+#: src/views/settings/index.tsx:95
 msgid "Your Trello account has been disconnected."
 msgstr "Your Trello account has been disconnected."
 
-#: src/views/settings/IntegrationsSettings.tsx:102
+#: src/views/settings/index.tsx:244
 msgid "Your Trello account is connected."
 msgstr "Your Trello account is connected."
 

apps/web/src/locales/es/messages.po

@@ -36,12 +36,12 @@ msgstr "{0} etiquetas"
 msgid "{boardCount, plural, one {Import board (1)} other {Import boards ({boardCount})}}"
 msgstr "{boardCount, plural, one {Importar tablero (1)} other {Importar tableros ({boardCount})}}"
 
-#: src/views/members/components/InviteMemberForm.tsx:92
-#: src/views/members/components/InviteMemberForm.tsx:104
+#: src/views/members/components/InviteMemberForm.tsx:91
+#: src/views/members/components/InviteMemberForm.tsx:106
 msgid "$10/month"
 msgstr "$10/mes"
 
-#: src/views/members/components/InviteMemberForm.tsx:104
+#: src/views/members/components/InviteMemberForm.tsx:106
 msgid "$8/month"
 msgstr "$8/mes"
 
@@ -53,10 +53,6 @@ msgstr "1 usuario"
 msgid "A powerful, flexible kanban app that helps you organise work, track progress, and deliver results—all in one place."
 msgstr "Una aplicación kanban potente y flexible que te ayuda a organizar el trabajo, seguir el progreso y entregar resultados, todo en un solo lugar."
 
-#: src/components/SettingsLayout.tsx:33
-msgid "Account"
-msgstr "Cuenta"
-
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:27
 msgid "Account deleted"
 msgstr "Cuenta eliminada"
@@ -95,13 +91,13 @@ msgstr "Añadir descripción... (escribe '/' para abrir comandos o '@' para menc
 msgid "Add details..."
 msgstr "Añadir detalles..."
 
-#: src/views/card/components/LabelSelector.tsx:109
-#: src/views/card/components/LabelSelector.tsx:114
+#: src/views/card/components/LabelSelector.tsx:110
+#: src/views/card/components/LabelSelector.tsx:118
 msgid "Add label"
 msgstr "Añadir etiqueta"
 
 #: src/views/card/components/MemberSelector.tsx:130
-#: src/views/members/components/InviteMemberForm.tsx:147
+#: src/views/members/components/InviteMemberForm.tsx:149
 msgid "Add member"
 msgstr "Añadir miembro"
 
@@ -136,14 +132,10 @@ msgstr "añadió el elemento <0>{0}</0> a la lista de verificación"
 msgid "added label <0>{0}</0>"
 msgstr "añadió la etiqueta <0>{0}</0>"
 
-#: src/views/members/components/InviteMemberForm.tsx:187
+#: src/views/members/components/InviteMemberForm.tsx:186
 msgid "Adding a new member will cost an additional {price} ({billingType}) per seat."
 msgstr "Añadir un nuevo miembro costará {price} adicionales ({billingType}) por asiento."
 
-#: src/views/settings/components/Avatar.tsx:278
-msgid "Adjust the square crop to fit your avatar."
-msgstr "Ajusta el recorte cuadrado para que se adapte a tu avatar."
-
 #: src/views/home/components/Pricing.tsx:55
 msgid "Admin roles"
 msgstr "Roles de administrador"
@@ -156,7 +148,7 @@ msgstr "Todos los sistemas operativos"
 msgid "Already have an account? <0><1>Sign in</1></0>"
 msgstr "¿Ya tienes una cuenta? <0><1>Iniciar sesión</1></0>"
 
-#: src/views/settings/IntegrationsSettings.tsx:61
+#: src/views/settings/index.tsx:102
 msgid "An error occurred while disconnecting your Trello account."
 msgstr "Ocurrió un error al desconectar tu cuenta de Trello."
 
@@ -164,27 +156,7 @@ msgstr "Ocurrió un error al desconectar tu cuenta de Trello."
 msgid "An unexpected error occurred. Please try again later."
 msgstr "Ha ocurrido un error inesperado. Por favor, inténtalo de nuevo más tarde."
 
-#: src/components/SettingsLayout.tsx:51
-msgid "API"
-msgstr "API"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:91
-msgid "API key created"
-msgstr "Clave API creada"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:161
-msgid "API key name"
-msgstr "Nombre de la clave API"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:25
-msgid "API key name cannot exceed 30 characters"
-msgstr "El nombre de la clave API no puede exceder los 30 caracteres"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:24
-msgid "API key name is required"
-msgstr "El nombre de la clave API es obligatorio"
-
-#: src/views/settings/ApiSettings.tsx:22
+#: src/views/settings/index.tsx:259
 msgid "API keys"
 msgstr "Claves API"
 
@@ -246,21 +218,20 @@ msgstr "Pendientes"
 msgid "Basic Kanban"
 msgstr "Kanban básico"
 
-#: src/views/members/components/InviteMemberForm.tsx:105
+#: src/views/members/components/InviteMemberForm.tsx:107
 msgid "billed annually"
 msgstr "facturado anualmente"
 
-#: src/views/members/components/InviteMemberForm.tsx:105
+#: src/views/members/components/InviteMemberForm.tsx:107
 msgid "billed monthly"
 msgstr "facturado mensualmente"
 
-#: src/components/SettingsLayout.tsx:44
 #: src/views/boards/components/TemplateBoards.tsx:55
-#: src/views/settings/BillingSettings.tsx:39
+#: src/views/settings/index.tsx:198
 msgid "Billing"
 msgstr "Facturación"
 
-#: src/views/settings/BillingSettings.tsx:49
+#: src/views/settings/index.tsx:208
 msgid "Billing portal"
 msgstr "Portal de facturación"
 
@@ -272,11 +243,6 @@ msgstr "Entrada de blog"
 msgid "Board"
 msgstr "Tablero"
 
-#: src/components/NewWorkspaceForm.tsx:346
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:81
-msgid "Board analytics"
-msgstr "Análisis del tablero"
-
 #: src/views/boards/components/NewBoardForm.tsx:21
 msgid "Board name cannot exceed 100 characters"
 msgstr "El nombre del tablero no puede exceder los 100 caracteres"
@@ -315,12 +281,12 @@ msgid "Board visibility updated"
 msgstr "Visibilidad del tablero actualizada"
 
 #: src/components/SideNavigation.tsx:68
-#: src/views/boards/index.tsx:32
+#: src/views/boards/index.tsx:27
 msgid "Boards"
 msgstr "Tableros"
 
 #. placeholder {0}: workspace.name ?? "Workspace"
-#: src/views/boards/index.tsx:28
+#: src/views/boards/index.tsx:23
 msgid "Boards | {0}"
 msgstr "Tableros | {0}"
 
@@ -342,11 +308,10 @@ msgstr "Informe de error"
 #: src/views/card/components/DeleteChecklistConfirmation.tsx:63
 #: src/views/card/components/DeleteCommentConfirmation.tsx:76
 #: src/views/members/components/DeleteMemberConfirmation.tsx:55
-#: src/views/settings/components/Avatar.tsx:309
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:168
+#: src/views/settings/components/CustomURLConfirmation.tsx:50
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:88
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:98
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:104
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -358,16 +323,16 @@ msgstr "Tarjeta no encontrada"
 msgid "Card title"
 msgstr "Título de la tarjeta"
 
-#: src/views/settings/AccountSettings.tsx:70
-#: src/views/settings/AccountSettings.tsx:80
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:109
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:178
+#: src/views/settings/index.tsx:291
+#: src/views/settings/index.tsx:301
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: src/views/settings/AccountSettings.tsx:45
-msgid "Change your language preferences."
-msgstr "Cambia tus preferencias de idioma."
+#: src/views/settings/index.tsx:190
+msgid "Change the language of the app."
+msgstr "Cambiar el idioma de la aplicación."
 
 #: src/views/auth/login/index.tsx:41
 #: src/views/auth/signup/index.tsx:67
@@ -387,10 +352,6 @@ msgstr "Borrar filtros"
 msgid "Click on the link we've sent to {magicLinkRecipient} to sign in."
 msgstr "Haz clic en el enlace que hemos enviado a {magicLinkRecipient} para iniciar sesión."
 
-#: src/views/settings/components/NewApiKeyModal.tsx:136
-msgid "Close"
-msgstr "Cerrar"
-
 #: src/views/boards/components/TemplateBoards.tsx:22
 msgid "Code Review"
 msgstr "Revisión de código"
@@ -399,9 +360,7 @@ msgstr "Revisión de código"
 msgid "Collaborate seamlessly with your team."
 msgstr "Colabora sin problemas con tu equipo."
 
-#: src/components/NewWorkspaceForm.tsx:349
 #: src/views/home/components/Features.tsx:66
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:84
 msgid "Coming soon"
 msgstr "Próximamente"
 
@@ -430,12 +389,16 @@ msgstr "completó un elemento de la lista de verificación"
 msgid "completed checklist item <0>{0}</0>"
 msgstr "completó el elemento <0>{0}</0> de la lista de verificación"
 
+#: src/views/settings/components/CustomURLConfirmation.tsx:42
+msgid "Confirm URL change"
+msgstr "Confirmar cambio de URL"
+
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:150
 msgid "Confirm your new password"
 msgstr "Confirma tu nueva contraseña"
 
 #: src/views/boards/components/ImportBoardsForm.tsx:157
-#: src/views/settings/IntegrationsSettings.tsx:93
+#: src/views/settings/index.tsx:235
 msgid "Connect Trello"
 msgstr "Conectar Trello"
 
@@ -443,7 +406,7 @@ msgstr "Conectar Trello"
 msgid "Connect your favorite tools to streamline your workflow."
 msgstr "Conecta tus herramientas favoritas para agilizar tu flujo de trabajo."
 
-#: src/views/settings/IntegrationsSettings.tsx:80
+#: src/views/settings/index.tsx:222
 msgid "Connect your Trello account to import boards."
 msgstr "Conecta tu cuenta de Trello para importar tableros."
 
@@ -478,10 +441,6 @@ msgstr "Controla quién puede ver y editar tus tableros."
 msgid "Create another"
 msgstr "Crear otro"
 
-#: src/views/settings/components/NewApiKeyModal.tsx:175
-msgid "Create API key"
-msgstr "Crear clave API"
-
 #: src/views/boards/components/NewBoardForm.tsx:128
 msgid "Create board"
 msgstr "Crear tablero"
@@ -506,12 +465,12 @@ msgstr "Crear lista"
 msgid "Create new board"
 msgstr "Crear nuevo tablero"
 
-#: src/views/settings/ApiSettings.tsx:30
+#: src/views/settings/components/CreateAPIKeyForm.tsx:54
 msgid "Create new key"
 msgstr "Crear nueva clave"
 
 #: src/views/board/components/NewCardForm.tsx:394
-#: src/views/card/components/LabelSelector.tsx:97
+#: src/views/card/components/LabelSelector.tsx:98
 msgid "Create new label"
 msgstr "Crear nueva etiqueta"
 
@@ -519,7 +478,7 @@ msgstr "Crear nueva etiqueta"
 msgid "Create new list"
 msgstr "Crear nueva lista"
 
-#: src/components/NewWorkspaceForm.tsx:384
+#: src/components/NewWorkspaceForm.tsx:94
 #: src/components/WorkspaceMenu.tsx:116
 msgid "Create workspace"
 msgstr "Crear espacio de trabajo"
@@ -532,10 +491,6 @@ msgstr "creó la tarjeta"
 msgid "Critical"
 msgstr "Crítico"
 
-#: src/views/settings/components/Avatar.tsx:275
-msgid "Crop your avatar"
-msgstr "Recorta tu avatar"
-
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:19
 msgid "Current password is required"
 msgstr "Se requiere la contraseña actual"
@@ -544,14 +499,9 @@ msgstr "Se requiere la contraseña actual"
 msgid "Custom domain"
 msgstr "Dominio personalizado"
 
-#: src/components/NewWorkspaceForm.tsx:315
-msgid "Custom URLs require upgrading to a Pro plan"
-msgstr "Las URLs personalizadas requieren actualizar a un plan Pro"
-
-#: src/components/NewWorkspaceForm.tsx:339
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:74
-msgid "Custom workspace URL"
-msgstr "URL personalizada del espacio de trabajo"
+#: src/views/settings/components/CustomURLConfirmation.tsx:45
+msgid "Custom URLs are a premium feature. You'll be directed to upgrade your account."
+msgstr "Las URL personalizadas son una función premium. Serás dirigido a actualizar tu cuenta."
 
 #: src/views/boards/components/TemplateBoards.tsx:41
 msgid "Customer Support"
@@ -569,9 +519,9 @@ msgstr "Oscuro"
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/views/settings/AccountSettings.tsx:52
-#: src/views/settings/AccountSettings.tsx:62
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:96
+#: src/views/settings/index.tsx:309
+#: src/views/settings/index.tsx:319
 msgid "Delete account"
 msgstr "Eliminar cuenta"
 
@@ -592,8 +542,8 @@ msgid "Delete list"
 msgstr "Eliminar lista"
 
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:106
-#: src/views/settings/WorkspaceSettings.tsx:96
-#: src/views/settings/WorkspaceSettings.tsx:107
+#: src/views/settings/index.tsx:272
+#: src/views/settings/index.tsx:283
 msgid "Delete workspace"
 msgstr "Eliminar espacio de trabajo"
 
@@ -619,7 +569,7 @@ msgstr "eliminó el elemento <0>{0}</0> de la lista de verificación"
 msgid "Design"
 msgstr "Diseño"
 
-#: src/views/settings/IntegrationsSettings.tsx:108
+#: src/views/settings/index.tsx:250
 msgid "Disconnect Trello"
 msgstr "Desconectar Trello"
 
@@ -627,7 +577,7 @@ msgstr "Desconectar Trello"
 msgid "Discuss and collaborate on cards."
 msgstr "Discute y colabora en las tarjetas."
 
-#: src/views/settings/AccountSettings.tsx:35
+#: src/views/settings/index.tsx:151
 msgid "Display name"
 msgstr "Nombre visible"
 
@@ -697,7 +647,7 @@ msgstr "Editando"
 msgid "email"
 msgstr "correo electrónico"
 
-#: src/views/members/components/InviteMemberForm.tsx:161
+#: src/views/members/components/InviteMemberForm.tsx:163
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -745,12 +695,12 @@ msgstr "Error al eliminar la etiqueta"
 msgid "Error deleting workspace"
 msgstr "Error al eliminar el espacio de trabajo"
 
-#: src/views/settings/IntegrationsSettings.tsx:60
+#: src/views/settings/index.tsx:101
 msgid "Error disconnecting Trello"
 msgstr "Error al desconectar Trello"
 
-#: src/views/members/components/InviteMemberForm.tsx:71
-#: src/views/members/components/InviteMemberForm.tsx:77
+#: src/views/members/components/InviteMemberForm.tsx:76
+#: src/views/members/components/InviteMemberForm.tsx:82
 msgid "Error inviting member"
 msgstr "Error al invitar al miembro"
 
@@ -758,7 +708,7 @@ msgstr "Error al invitar al miembro"
 msgid "Error updating display name"
 msgstr "Error al actualizar el nombre visible"
 
-#: src/views/settings/components/Avatar.tsx:80
+#: src/views/settings/components/Avatar.tsx:39
 msgid "Error updating profile image"
 msgstr "Error al actualizar la imagen de perfil"
 
@@ -774,17 +724,12 @@ msgstr "Error al actualizar el nombre del espacio de trabajo"
 msgid "Error updating workspace URL"
 msgstr "Error al actualizar la URL del espacio de trabajo"
 
-#: src/views/members/components/InviteMemberForm.tsx:130
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:41
+#: src/views/members/components/InviteMemberForm.tsx:132
 msgid "Error upgrading subscription"
 msgstr "Error al actualizar la suscripción"
 
-#: src/components/NewWorkspaceForm.tsx:142
-msgid "Error upgrading to Pro"
-msgstr "Error al actualizar a Pro"
-
-#: src/views/settings/components/Avatar.tsx:94
-#: src/views/settings/components/Avatar.tsx:221
+#: src/views/settings/components/Avatar.tsx:56
+#: src/views/settings/components/Avatar.tsx:97
 msgid "Error uploading profile image"
 msgstr "Error al subir la imagen de perfil"
 
@@ -849,8 +794,8 @@ msgstr "Para la sostenibilidad a largo plazo, reconocemos que todos los buenos p
 msgid "Free"
 msgstr "Gratis"
 
-#: src/views/members/components/InviteMemberForm.tsx:193
-#: src/views/members/index.tsx:208
+#: src/views/members/components/InviteMemberForm.tsx:192
+#: src/views/members/index.tsx:184
 msgid "Free Plan"
 msgstr "Plan gratuito"
 
@@ -959,7 +904,7 @@ msgstr "Ideas"
 msgid "Ideas to improve this page..."
 msgstr "Ideas para mejorar esta página..."
 
-#: src/views/boards/index.tsx:43
+#: src/views/boards/index.tsx:38
 msgid "Import"
 msgstr "Importar"
 
@@ -997,7 +942,6 @@ msgstr "En progreso"
 msgid "Individuals"
 msgstr "Individuos"
 
-#: src/components/SettingsLayout.tsx:57
 #: src/views/home/components/Features.tsx:114
 msgid "Integrations"
 msgstr "Integraciones"
@@ -1006,24 +950,24 @@ msgstr "Integraciones"
 msgid "Interviewing"
 msgstr "Entrevistando"
 
-#: src/views/members/components/InviteMemberForm.tsx:40
+#: src/views/members/components/InviteMemberForm.tsx:45
 msgid "Invalid email address"
 msgstr "Dirección de correo electrónico no válida"
 
-#: src/views/members/index.tsx:221
+#: src/views/members/index.tsx:193
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/views/members/components/InviteMemberForm.tsx:208
+#: src/views/members/components/InviteMemberForm.tsx:207
 msgid "Invite another"
 msgstr "Invitar a otro"
 
-#: src/views/card/components/MemberSelector.tsx:111
-#: src/views/members/components/InviteMemberForm.tsx:233
+#: src/views/card/components/MemberSelector.tsx:112
+#: src/views/members/components/InviteMemberForm.tsx:231
 msgid "Invite member"
 msgstr "Invitar miembro"
 
-#: src/views/members/components/InviteMemberForm.tsx:196
+#: src/views/members/components/InviteMemberForm.tsx:195
 msgid "Inviting members requires a Team Plan. You'll be redirected to upgrade your workspace."
 msgstr "Invitar miembros requiere un Plan de Equipo. Serás redirigido para actualizar tu espacio de trabajo."
 
@@ -1054,23 +998,10 @@ msgstr "Etiquetas"
 msgid "Labels & Filters"
 msgstr "Etiquetas y filtros"
 
-#: src/views/settings/AccountSettings.tsx:42
+#: src/views/settings/index.tsx:187
 msgid "Language"
 msgstr "Idioma"
 
-#: src/components/NewWorkspaceForm.tsx:332
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:67
-msgid "Launch offer"
-msgstr "Oferta de lanzamiento"
-
-#: src/views/members/index.tsx:191
-msgid "Launch offer: Get unlimited members with Pro"
-msgstr "Oferta de lanzamiento: Obtén miembros ilimitados con Pro"
-
-#: src/views/home/components/Pricing.tsx:99
-msgid "Launch offer: unlimited seats for just $29/month with Pro"
-msgstr "Oferta de lanzamiento: asientos ilimitados por solo $29/mes con Pro"
-
 #: src/views/boards/components/TemplateBoards.tsx:83
 msgid "Learning"
 msgstr "Aprendizaje"
@@ -1136,12 +1067,12 @@ msgstr "Prioridad media"
 #: src/views/board/components/Filters.tsx:93
 #: src/views/board/components/NewCardForm.tsx:357
 #: src/views/card/index.tsx:125
-#: src/views/members/index.tsx:178
+#: src/views/members/index.tsx:171
 msgid "Members"
 msgstr "Miembros"
 
 #. placeholder {0}: workspace.name ?? "Workspace"
-#: src/views/members/index.tsx:173
+#: src/views/members/index.tsx:167
 msgid "Members | {0}"
 msgstr "Miembros | {0}"
 
@@ -1149,7 +1080,7 @@ msgstr "Miembros | {0}"
 msgid "Monthly"
 msgstr "Mensual"
 
-#: src/views/members/components/InviteMemberForm.tsx:93
+#: src/views/members/components/InviteMemberForm.tsx:92
 msgid "monthly billing"
 msgstr "facturación mensual"
 
@@ -1172,14 +1103,10 @@ msgstr "Nombre"
 msgid "Need help?"
 msgstr "¿Necesitas ayuda?"
 
-#: src/views/boards/index.tsx:53
+#: src/views/boards/index.tsx:48
 msgid "New"
 msgstr "Nuevo"
 
-#: src/views/settings/components/NewApiKeyModal.tsx:147
-msgid "New API key"
-msgstr "Nueva clave API"
-
 #: src/views/boards/components/NewBoardForm.tsx:85
 msgid "New board"
 msgstr "Nuevo tablero"
@@ -1217,7 +1144,7 @@ msgstr "La nueva contraseña debe ser diferente de la contraseña actual"
 msgid "New Ticket"
 msgstr "Nuevo ticket"
 
-#: src/components/NewWorkspaceForm.tsx:240
+#: src/components/NewWorkspaceForm.tsx:65
 msgid "New workspace"
 msgstr "Nuevo espacio de trabajo"
 
@@ -1253,11 +1180,11 @@ msgstr "Oferta"
 msgid "Onboarding"
 msgstr "Incorporación"
 
-#: src/views/settings/AccountSettings.tsx:55
+#: src/views/settings/index.tsx:312
 msgid "Once you delete your account, there is no going back. This action cannot be undone."
 msgstr "Una vez que elimines tu cuenta, no hay vuelta atrás. Esta acción no se puede deshacer."
 
-#: src/views/settings/WorkspaceSettings.tsx:99
+#: src/views/settings/index.tsx:275
 msgid "Once you delete your workspace, there is no going back. This action cannot be undone."
 msgstr "Una vez que elimines tu espacio de trabajo, no hay vuelta atrás. Esta acción no se puede deshacer."
 
@@ -1289,15 +1216,11 @@ msgstr "La contraseña debe tener al menos 8 caracteres"
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: src/views/members/index.tsx:134
-msgid "Paused"
-msgstr "Pausado"
-
-#: src/views/home/components/Pricing.tsx:102
+#: src/views/home/components/Pricing.tsx:96
 msgid "Payment frequency"
 msgstr "Frecuencia de pago"
 
-#: src/views/members/index.tsx:134
+#: src/views/members/index.tsx:128
 msgid "Pending"
 msgstr "Pendiente"
 
@@ -1330,13 +1253,13 @@ msgstr "Por favor, introduce un nombre válido"
 msgid "Please enter a valid password"
 msgstr "Por favor, introduce una contraseña válida"
 
-#: src/views/settings/components/Avatar.tsx:95
+#: src/views/settings/components/Avatar.tsx:57
 msgid "Please select a file to upload."
 msgstr "Por favor selecciona un archivo para subir."
 
 #: src/components/DeleteLabelConfirmation.tsx:26
 #: src/components/FeedbackModal.tsx:41
-#: src/components/NewWorkspaceForm.tsx:155
+#: src/components/NewWorkspaceForm.tsx:42
 #: src/views/board/components/NewCardForm.tsx:174
 #: src/views/board/components/NewListForm.tsx:78
 #: src/views/board/components/UpdateBoardSlugForm.tsx:72
@@ -1351,25 +1274,24 @@ msgstr "Por favor selecciona un archivo para subir."
 #: src/views/card/components/DeleteCardConfirmation.tsx:52
 #: src/views/card/components/DeleteChecklistConfirmation.tsx:37
 #: src/views/card/components/DeleteCommentConfirmation.tsx:45
-#: src/views/card/components/LabelSelector.tsx:72
-#: src/views/card/components/ListSelector.tsx:52
-#: src/views/card/components/MemberSelector.tsx:79
+#: src/views/card/components/LabelSelector.tsx:73
+#: src/views/card/components/ListSelector.tsx:53
+#: src/views/card/components/MemberSelector.tsx:80
 #: src/views/card/components/NewChecklistForm.tsx:70
 #: src/views/card/components/NewChecklistItemForm.tsx:89
 #: src/views/card/components/NewCommentForm.tsx:31
 #: src/views/card/index.tsx:173
 #: src/views/members/components/DeleteMemberConfirmation.tsx:28
-#: src/views/members/components/InviteMemberForm.tsx:78
-#: src/views/members/components/InviteMemberForm.tsx:131
-#: src/views/settings/components/Avatar.tsx:81
-#: src/views/settings/components/Avatar.tsx:222
+#: src/views/members/components/InviteMemberForm.tsx:83
+#: src/views/members/components/InviteMemberForm.tsx:133
+#: src/views/settings/components/Avatar.tsx:40
+#: src/views/settings/components/Avatar.tsx:98
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:40
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:46
 #: src/views/settings/components/UpdateDisplayNameForm.tsx:55
 #: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:62
 #: src/views/settings/components/UpdateWorkspaceNameForm.tsx:57
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:74
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:42
 msgid "Please try again later, or contact customer support."
 msgstr "Por favor, inténtalo de nuevo más tarde o contacta con atención al cliente."
 
@@ -1380,7 +1302,6 @@ msgid "Pricing"
 msgstr "Precios"
 
 #: src/views/home/components/Pricing.tsx:56
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:91
 msgid "Priority email support"
 msgstr "Soporte prioritario por email"
 
@@ -1392,19 +1313,11 @@ msgstr "Política de privacidad"
 msgid "Private"
 msgstr "Privado"
 
-#: src/views/members/index.tsx:205
-msgid "Pro Plan"
-msgstr "Plan Pro"
-
-#: src/views/members/components/InviteMemberForm.tsx:182
-msgid "Pro Plan ∞"
-msgstr "Plan Pro ∞"
-
-#: src/views/settings/components/Avatar.tsx:67
+#: src/views/settings/components/Avatar.tsx:26
 msgid "Profile image updated"
 msgstr "Imagen de perfil actualizada"
 
-#: src/views/settings/AccountSettings.tsx:29
+#: src/views/settings/index.tsx:146
 msgid "Profile picture"
 msgstr "Foto de perfil"
 
@@ -1440,7 +1353,7 @@ msgstr "Remoto"
 msgid "Remove"
 msgstr "Eliminar"
 
-#: src/views/members/index.tsx:148
+#: src/views/members/index.tsx:142
 msgid "Remove member"
 msgstr "Eliminar miembro"
 
@@ -1487,12 +1400,16 @@ msgstr "Recursos"
 msgid "Review"
 msgstr "Revisión"
 
+#: src/views/settings/components/CreateAPIKeyForm.tsx:49
+msgid "Revoke"
+msgstr "Revocar"
+
 #: src/views/home/components/Footer.tsx:36
 #: src/views/home/components/Header.tsx:13
 msgid "Roadmap"
 msgstr "Hoja de ruta"
 
-#: src/views/members/index.tsx:243
+#: src/views/members/index.tsx:215
 msgid "Role"
 msgstr "Rol"
 
@@ -1501,7 +1418,6 @@ msgid "Run on your own infrastructure"
 msgstr "Ejecuta en tu propia infraestructura"
 
 #: src/views/card/components/Comment.tsx:165
-#: src/views/settings/components/Avatar.tsx:312
 msgid "Save"
 msgstr "Guardar"
 
@@ -1541,30 +1457,15 @@ msgstr "Enviar comentarios"
 msgid "Senior"
 msgstr "Senior"
 
-#: src/components/SettingsLayout.tsx:82
 #: src/components/SideNavigation.tsx:78
+#: src/views/settings/index.tsx:140
 msgid "Settings"
 msgstr "Configuración"
 
-#: src/views/settings/AccountSettings.tsx:25
-msgid "Settings | Account"
-msgstr "Configuración | Cuenta"
-
-#: src/views/settings/ApiSettings.tsx:18
-msgid "Settings | API"
-msgstr "Configuración | API"
-
-#: src/views/settings/BillingSettings.tsx:35
-msgid "Settings | Billing"
-msgstr "Configuración | Facturación"
-
-#: src/views/settings/IntegrationsSettings.tsx:69
-msgid "Settings | Integrations"
-msgstr "Configuración | Integraciones"
-
-#: src/views/settings/WorkspaceSettings.tsx:54
-msgid "Settings | Workspace"
-msgstr "Configuración | Espacio de trabajo"
+#. placeholder {0}: workspace.name ?? "Workspace"
+#: src/views/settings/index.tsx:136
+msgid "Settings | {0}"
+msgstr "Configuración | {0}"
 
 #: src/views/home/components/Header.tsx:100
 #: src/views/home/components/Header.tsx:138
@@ -1613,10 +1514,6 @@ msgstr "Estrella en Github"
 msgid "Success"
 msgstr "Éxito"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:55
-msgid "Supercharge your workspace for just $29/month. Here's what you'll get:"
-msgstr "Potencia tu espacio de trabajo por solo $29/mes. Esto es lo que obtendrás:"
-
 #: src/components/UserMenu.tsx:180
 msgid "Support"
 msgstr "Soporte"
@@ -1629,8 +1526,8 @@ msgstr "Apoya el desarrollo del proyecto"
 msgid "System"
 msgstr "Sistema"
 
-#: src/views/members/components/InviteMemberForm.tsx:182
-#: src/views/members/index.tsx:207
+#: src/views/members/components/InviteMemberForm.tsx:183
+#: src/views/members/index.tsx:184
 msgid "Team Plan"
 msgstr "Plan de Equipo"
 
@@ -1682,10 +1579,6 @@ msgstr "No podrán acceder a este espacio de trabajo."
 msgid "This action can't be undone."
 msgstr "Esta acción no se puede deshacer."
 
-#: src/views/settings/components/NewApiKeyModal.tsx:129
-msgid "This API key will only be shown once. Please save it in a secure location."
-msgstr "Esta clave API solo se mostrará una vez. Por favor, guárdala en un lugar seguro."
-
 #: src/views/public/board/index.tsx:151
 msgid "This board is private or does not exist"
 msgstr "Este tablero es privado o no existe"
@@ -1702,14 +1595,6 @@ msgstr "Esto resultará en la eliminación permanente de todos los datos asociad
 msgid "This will result in the permanent deletion of all data associated with your account."
 msgstr "Esto resultará en la eliminación permanente de todos los datos asociados con tu cuenta."
 
-#: src/components/NewWorkspaceForm.tsx:284
-msgid "This workspace URL has already been taken"
-msgstr "Esta URL de espacio de trabajo ya ha sido tomada"
-
-#: src/components/NewWorkspaceForm.tsx:286
-msgid "This workspace URL is reserved"
-msgstr "Esta URL de espacio de trabajo está reservada"
-
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:123
 msgid "This workspace username has already been taken"
 msgstr "Este nombre de usuario del espacio de trabajo ya ha sido tomado"
@@ -1727,11 +1612,7 @@ msgstr "Alternar menú"
 msgid "Track all card changes with detailed activity history."
 msgstr "Rastrea todos los cambios en las tarjetas con un historial de actividad detallado."
 
-#: src/views/settings/IntegrationsSettings.tsx:73
-msgid "Trello"
-msgstr "Trello"
-
-#: src/views/settings/IntegrationsSettings.tsx:53
+#: src/views/settings/index.tsx:94
 msgid "Trello disconnected"
 msgstr "Trello desconectado"
 
@@ -1763,7 +1644,7 @@ msgstr "No se puede crear la lista de verificación"
 msgid "Unable to create list"
 msgstr "No se puede crear la lista"
 
-#: src/components/NewWorkspaceForm.tsx:154
+#: src/components/NewWorkspaceForm.tsx:41
 msgid "Unable to create workspace"
 msgstr "No se puede crear el espacio de trabajo"
 
@@ -1816,16 +1697,16 @@ msgstr "No se puede actualizar el elemento de la lista de verificación"
 msgid "Unable to update comment"
 msgstr "No se puede actualizar el comentario"
 
-#: src/views/card/components/LabelSelector.tsx:71
+#: src/views/card/components/LabelSelector.tsx:72
 msgid "Unable to update labels"
 msgstr "No se pueden actualizar las etiquetas"
 
 #: src/views/board/index.tsx:133
-#: src/views/card/components/ListSelector.tsx:51
+#: src/views/card/components/ListSelector.tsx:52
 msgid "Unable to update list"
 msgstr "No se puede actualizar la lista"
 
-#: src/views/card/components/MemberSelector.tsx:78
+#: src/views/card/components/MemberSelector.tsx:79
 msgid "Unable to update members"
 msgstr "No se pueden actualizar los miembros"
 
@@ -1862,15 +1743,10 @@ msgstr "Comentarios ilimitados"
 msgid "Unlimited lists"
 msgstr "Listas ilimitadas"
 
-#: src/components/NewWorkspaceForm.tsx:329
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:64
-msgid "Unlimited members"
-msgstr "Miembros ilimitados"
-
 #: src/views/board/components/UpdateBoardSlugForm.tsx:174
-#: src/views/settings/components/UpdateDisplayNameForm.tsx:80
-#: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:91
-#: src/views/settings/components/UpdateWorkspaceNameForm.tsx:83
+#: src/views/settings/components/UpdateDisplayNameForm.tsx:79
+#: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:90
+#: src/views/settings/components/UpdateWorkspaceNameForm.tsx:82
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:154
 msgid "Update"
 msgstr "Actualizar"
@@ -1896,20 +1772,11 @@ msgstr "actualizó el título"
 msgid "updated the title to <0>{0}</0>"
 msgstr "actualizó el título a <0>{0}</0>"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:109
+#: src/views/settings/components/CustomURLConfirmation.tsx:52
 msgid "Upgrade"
 msgstr "Actualizar"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:52
-#: src/views/settings/WorkspaceSettings.tsx:89
-msgid "Upgrade to Pro"
-msgstr "Actualizar a Pro"
-
-#: src/components/NewWorkspaceForm.tsx:369
-msgid "Upgrade to Pro ($29/month)"
-msgstr "Actualizar a Pro ($29/mes)"
-
-#: src/views/members/components/InviteMemberForm.tsx:224
+#: src/views/members/components/InviteMemberForm.tsx:222
 msgid "Upgrade to Team Plan"
 msgstr "Actualizar al Plan de Equipo"
 
@@ -1918,17 +1785,14 @@ msgstr "Actualizar al Plan de Equipo"
 msgid "Urgent"
 msgstr "Urgente"
 
-#: src/components/NewWorkspaceForm.tsx:35
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:36
 msgid "URL can only contain letters, numbers, and hyphens"
 msgstr "La URL solo puede contener letras, números y guiones"
 
-#: src/components/NewWorkspaceForm.tsx:33
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:34
 msgid "URL cannot exceed 24 characters"
 msgstr "La URL no puede exceder los 24 caracteres"
 
-#: src/components/NewWorkspaceForm.tsx:31
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:32
 msgid "URL must be at least 3 characters long"
 msgstr "La URL debe tener al menos 3 caracteres"
@@ -1937,11 +1801,11 @@ msgstr "La URL debe tener al menos 3 caracteres"
 msgid "Use template"
 msgstr "Usar plantilla"
 
-#: src/views/members/index.tsx:237
+#: src/views/members/index.tsx:209
 msgid "User"
 msgstr "Usuario"
 
-#: src/views/members/components/InviteMemberForm.tsx:72
+#: src/views/members/components/InviteMemberForm.tsx:77
 msgid "User is already a member of this workspace"
 msgstr "El usuario ya es miembro de este espacio de trabajo"
 
@@ -1949,11 +1813,11 @@ msgstr "El usuario ya es miembro de este espacio de trabajo"
 msgid "Video"
 msgstr "Video"
 
-#: src/views/settings/ApiSettings.tsx:25
+#: src/views/settings/index.tsx:262
 msgid "View and manage your API keys."
 msgstr "Ver y gestionar tus claves API."
 
-#: src/views/settings/BillingSettings.tsx:42
+#: src/views/settings/index.tsx:201
 msgid "View and manage your billing and subscription."
 msgstr "Ver y gestionar tu facturación y suscripción."
 
@@ -2005,20 +1869,15 @@ msgstr "Cuando Trello se lanzó en 2011, impresionó a todos con su simplicidad
 msgid "Why make an open source Trello?"
 msgstr "¿Por qué crear un Trello de código abierto?"
 
-#: src/components/SettingsLayout.tsx:39
 #: src/views/board/index.tsx:331
 msgid "Workspace"
 msgstr "Espacio de trabajo"
 
-#: src/components/NewWorkspaceForm.tsx:143
-msgid "Workspace created successfully. You can upgrade later in settings."
-msgstr "Espacio de trabajo creado con éxito. Puedes actualizar más tarde en configuración."
-
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:26
 msgid "Workspace deleted"
 msgstr "Espacio de trabajo eliminado"
 
-#: src/views/settings/WorkspaceSettings.tsx:75
+#: src/views/settings/index.tsx:177
 msgid "Workspace description"
 msgstr "Descripción del espacio de trabajo"
 
@@ -2039,8 +1898,8 @@ msgstr "Descripción del espacio de trabajo actualizada"
 msgid "Workspace members"
 msgstr "Miembros del espacio de trabajo"
 
-#: src/components/NewWorkspaceForm.tsx:259
-#: src/views/settings/WorkspaceSettings.tsx:58
+#: src/components/NewWorkspaceForm.tsx:81
+#: src/views/settings/index.tsx:158
 msgid "Workspace name"
 msgstr "Nombre del espacio de trabajo"
 
@@ -2048,10 +1907,6 @@ msgstr "Nombre del espacio de trabajo"
 msgid "Workspace name cannot exceed 24 characters"
 msgstr "El nombre del espacio de trabajo no puede exceder los 24 caracteres"
 
-#: src/components/NewWorkspaceForm.tsx:27
-msgid "Workspace name is required"
-msgstr "El nombre del espacio de trabajo es obligatorio"
-
 #: src/views/settings/components/UpdateWorkspaceNameForm.tsx:14
 msgid "Workspace name must be at least 3 characters long"
 msgstr "El nombre del espacio de trabajo debe tener al menos 3 caracteres"
@@ -2064,14 +1919,10 @@ msgstr "Nombre del espacio de trabajo actualizado"
 msgid "Workspace slug updated"
 msgstr "Slug del espacio de trabajo actualizado"
 
-#: src/views/settings/WorkspaceSettings.tsx:66
+#: src/views/settings/index.tsx:167
 msgid "Workspace URL"
 msgstr "URL del espacio de trabajo"
 
-#: src/components/NewWorkspaceForm.tsx:273
-msgid "workspace-url"
-msgstr "workspace-url"
-
 #: src/views/boards/components/TemplateBoards.tsx:30
 msgid "Writing"
 msgstr "Escritura"
@@ -2084,7 +1935,7 @@ msgstr "Anual"
 msgid "Yes, we offer an forever free plan for individual use. No restrictions, no paywalls, no limits."
 msgstr "Sí, ofrecemos un plan gratuito para siempre para uso individual. Sin restricciones, sin muros de pago, sin límites."
 
-#: src/views/settings/AccountSettings.tsx:73
+#: src/views/settings/index.tsx:294
 msgid "You are about to change your password."
 msgstr "Estás a punto de cambiar tu contraseña."
 
@@ -2108,10 +1959,6 @@ msgstr "Has iniciado sesión correctamente."
 msgid "You have been signed up successfully."
 msgstr "Te has registrado correctamente."
 
-#: src/views/members/components/InviteMemberForm.tsx:186
-msgid "You have unlimited seats with your Pro Plan. There is no additional charge for new members!"
-msgstr "Tienes plazas ilimitadas con tu Plan Pro. ¡No hay cargos adicionales por nuevos miembros!"
-
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:28
 msgid "Your account has been deleted."
 msgstr "Tu cuenta ha sido eliminada."
@@ -2128,15 +1975,15 @@ msgstr "Tu nombre de visualización ha sido actualizado."
 msgid "Your password has been changed."
 msgstr "Tu contraseña ha sido cambiada."
 
-#: src/views/settings/components/Avatar.tsx:68
+#: src/views/settings/components/Avatar.tsx:27
 msgid "Your profile image has been updated."
 msgstr "Tu imagen de perfil ha sido actualizada."
 
-#: src/views/settings/IntegrationsSettings.tsx:54
+#: src/views/settings/index.tsx:95
 msgid "Your Trello account has been disconnected."
 msgstr "Tu cuenta de Trello ha sido desconectada."
 
-#: src/views/settings/IntegrationsSettings.tsx:102
+#: src/views/settings/index.tsx:244
 msgid "Your Trello account is connected."
 msgstr "Tu cuenta de Trello está conectada."
 

apps/web/src/locales/fr/messages.po

@@ -36,12 +36,12 @@ msgstr "{0} étiquettes"
 msgid "{boardCount, plural, one {Import board (1)} other {Import boards ({boardCount})}}"
 msgstr "{boardCount, plural, one {Importer le tableau (1)} other {Importer les tableaux ({boardCount})}}"
 
-#: src/views/members/components/InviteMemberForm.tsx:92
-#: src/views/members/components/InviteMemberForm.tsx:104
+#: src/views/members/components/InviteMemberForm.tsx:91
+#: src/views/members/components/InviteMemberForm.tsx:106
 msgid "$10/month"
 msgstr "10 $/mois"
 
-#: src/views/members/components/InviteMemberForm.tsx:104
+#: src/views/members/components/InviteMemberForm.tsx:106
 msgid "$8/month"
 msgstr "8 $/mois"
 
@@ -53,10 +53,6 @@ msgstr "1 utilisateur"
 msgid "A powerful, flexible kanban app that helps you organise work, track progress, and deliver results—all in one place."
 msgstr "Une application kanban puissante et flexible qui vous aide à organiser le travail, suivre les progrès et livrer des résultats—le tout en un seul endroit."
 
-#: src/components/SettingsLayout.tsx:33
-msgid "Account"
-msgstr "Compte"
-
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:27
 msgid "Account deleted"
 msgstr "Compte supprimé"
@@ -95,13 +91,13 @@ msgstr "Ajouter une description... (tapez '/' pour ouvrir les commandes ou '@' p
 msgid "Add details..."
 msgstr "Ajouter des détails..."
 
-#: src/views/card/components/LabelSelector.tsx:109
-#: src/views/card/components/LabelSelector.tsx:114
+#: src/views/card/components/LabelSelector.tsx:110
+#: src/views/card/components/LabelSelector.tsx:118
 msgid "Add label"
 msgstr "Ajouter une étiquette"
 
 #: src/views/card/components/MemberSelector.tsx:130
-#: src/views/members/components/InviteMemberForm.tsx:147
+#: src/views/members/components/InviteMemberForm.tsx:149
 msgid "Add member"
 msgstr "Ajouter un membre"
 
@@ -136,14 +132,10 @@ msgstr "a ajouté l'élément <0>{0}</0> à la checklist"
 msgid "added label <0>{0}</0>"
 msgstr "a ajouté l'étiquette <0>{0}</0>"
 
-#: src/views/members/components/InviteMemberForm.tsx:187
+#: src/views/members/components/InviteMemberForm.tsx:186
 msgid "Adding a new member will cost an additional {price} ({billingType}) per seat."
 msgstr "L'ajout d'un nouveau membre coûtera {price} supplémentaires ({billingType}) par siège."
 
-#: src/views/settings/components/Avatar.tsx:278
-msgid "Adjust the square crop to fit your avatar."
-msgstr "Ajustez le recadrage carré pour adapter votre avatar."
-
 #: src/views/home/components/Pricing.tsx:55
 msgid "Admin roles"
 msgstr "Rôles d'administrateur"
@@ -156,7 +148,7 @@ msgstr "Tous les systèmes opérationnels"
 msgid "Already have an account? <0><1>Sign in</1></0>"
 msgstr "Vous avez déjà un compte ? <0><1>Connectez-vous</1></0>"
 
-#: src/views/settings/IntegrationsSettings.tsx:61
+#: src/views/settings/index.tsx:102
 msgid "An error occurred while disconnecting your Trello account."
 msgstr "Une erreur s'est produite lors de la déconnexion de votre compte Trello."
 
@@ -164,27 +156,7 @@ msgstr "Une erreur s'est produite lors de la déconnexion de votre compte Trello
 msgid "An unexpected error occurred. Please try again later."
 msgstr "Une erreur inattendue s'est produite. Veuillez réessayer plus tard."
 
-#: src/components/SettingsLayout.tsx:51
-msgid "API"
-msgstr "API"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:91
-msgid "API key created"
-msgstr "Clé API créée"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:161
-msgid "API key name"
-msgstr "Nom de la clé API"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:25
-msgid "API key name cannot exceed 30 characters"
-msgstr "Le nom de la clé API ne peut pas dépasser 30 caractères"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:24
-msgid "API key name is required"
-msgstr "Le nom de la clé API est requis"
-
-#: src/views/settings/ApiSettings.tsx:22
+#: src/views/settings/index.tsx:259
 msgid "API keys"
 msgstr "Clés API"
 
@@ -246,21 +218,20 @@ msgstr "Backlog"
 msgid "Basic Kanban"
 msgstr "Kanban basique"
 
-#: src/views/members/components/InviteMemberForm.tsx:105
+#: src/views/members/components/InviteMemberForm.tsx:107
 msgid "billed annually"
 msgstr "facturation annuelle"
 
-#: src/views/members/components/InviteMemberForm.tsx:105
+#: src/views/members/components/InviteMemberForm.tsx:107
 msgid "billed monthly"
 msgstr "facturation mensuelle"
 
-#: src/components/SettingsLayout.tsx:44
 #: src/views/boards/components/TemplateBoards.tsx:55
-#: src/views/settings/BillingSettings.tsx:39
+#: src/views/settings/index.tsx:198
 msgid "Billing"
 msgstr "Facturation"
 
-#: src/views/settings/BillingSettings.tsx:49
+#: src/views/settings/index.tsx:208
 msgid "Billing portal"
 msgstr "Portail de facturation"
 
@@ -272,11 +243,6 @@ msgstr "Article de blog"
 msgid "Board"
 msgstr "Tableau"
 
-#: src/components/NewWorkspaceForm.tsx:346
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:81
-msgid "Board analytics"
-msgstr "Analyses du tableau"
-
 #: src/views/boards/components/NewBoardForm.tsx:21
 msgid "Board name cannot exceed 100 characters"
 msgstr "Le nom du tableau ne peut pas dépasser 100 caractères"
@@ -315,12 +281,12 @@ msgid "Board visibility updated"
 msgstr "Visibilité du tableau mise à jour"
 
 #: src/components/SideNavigation.tsx:68
-#: src/views/boards/index.tsx:32
+#: src/views/boards/index.tsx:27
 msgid "Boards"
 msgstr "Tableaux"
 
 #. placeholder {0}: workspace.name ?? "Workspace"
-#: src/views/boards/index.tsx:28
+#: src/views/boards/index.tsx:23
 msgid "Boards | {0}"
 msgstr "Tableaux | {0}"
 
@@ -342,11 +308,10 @@ msgstr "Rapport de bug"
 #: src/views/card/components/DeleteChecklistConfirmation.tsx:63
 #: src/views/card/components/DeleteCommentConfirmation.tsx:76
 #: src/views/members/components/DeleteMemberConfirmation.tsx:55
-#: src/views/settings/components/Avatar.tsx:309
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:168
+#: src/views/settings/components/CustomURLConfirmation.tsx:50
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:88
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:98
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:104
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -358,16 +323,16 @@ msgstr "Carte introuvable"
 msgid "Card title"
 msgstr "Titre de la carte"
 
-#: src/views/settings/AccountSettings.tsx:70
-#: src/views/settings/AccountSettings.tsx:80
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:109
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:178
+#: src/views/settings/index.tsx:291
+#: src/views/settings/index.tsx:301
 msgid "Change Password"
 msgstr "Modifier le mot de passe"
 
-#: src/views/settings/AccountSettings.tsx:45
-msgid "Change your language preferences."
-msgstr "Modifiez vos préférences linguistiques."
+#: src/views/settings/index.tsx:190
+msgid "Change the language of the app."
+msgstr "Changer la langue de l'application."
 
 #: src/views/auth/login/index.tsx:41
 #: src/views/auth/signup/index.tsx:67
@@ -387,10 +352,6 @@ msgstr "Effacer les filtres"
 msgid "Click on the link we've sent to {magicLinkRecipient} to sign in."
 msgstr "Cliquez sur le lien que nous avons envoyé à {magicLinkRecipient} pour vous connecter."
 
-#: src/views/settings/components/NewApiKeyModal.tsx:136
-msgid "Close"
-msgstr "Fermer"
-
 #: src/views/boards/components/TemplateBoards.tsx:22
 msgid "Code Review"
 msgstr "Revue de code"
@@ -399,9 +360,7 @@ msgstr "Revue de code"
 msgid "Collaborate seamlessly with your team."
 msgstr "Collaborez en toute fluidité avec votre équipe."
 
-#: src/components/NewWorkspaceForm.tsx:349
 #: src/views/home/components/Features.tsx:66
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:84
 msgid "Coming soon"
 msgstr "Bientôt disponible"
 
@@ -430,12 +389,16 @@ msgstr "a terminé un élément de la checklist"
 msgid "completed checklist item <0>{0}</0>"
 msgstr "a terminé l'élément <0>{0}</0> de la checklist"
 
+#: src/views/settings/components/CustomURLConfirmation.tsx:42
+msgid "Confirm URL change"
+msgstr "Confirmer le changement d'URL"
+
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:150
 msgid "Confirm your new password"
 msgstr "Confirmez votre nouveau mot de passe"
 
 #: src/views/boards/components/ImportBoardsForm.tsx:157
-#: src/views/settings/IntegrationsSettings.tsx:93
+#: src/views/settings/index.tsx:235
 msgid "Connect Trello"
 msgstr "Connecter Trello"
 
@@ -443,7 +406,7 @@ msgstr "Connecter Trello"
 msgid "Connect your favorite tools to streamline your workflow."
 msgstr "Connectez vos outils favoris pour simplifier votre flux de travail."
 
-#: src/views/settings/IntegrationsSettings.tsx:80
+#: src/views/settings/index.tsx:222
 msgid "Connect your Trello account to import boards."
 msgstr "Connectez votre compte Trello pour importer des tableaux."
 
@@ -478,10 +441,6 @@ msgstr "Contrôlez qui peut voir et modifier vos tableaux."
 msgid "Create another"
 msgstr "Créer un autre"
 
-#: src/views/settings/components/NewApiKeyModal.tsx:175
-msgid "Create API key"
-msgstr "Créer une clé API"
-
 #: src/views/boards/components/NewBoardForm.tsx:128
 msgid "Create board"
 msgstr "Créer un tableau"
@@ -506,12 +465,12 @@ msgstr "Créer une liste"
 msgid "Create new board"
 msgstr "Créer un nouveau tableau"
 
-#: src/views/settings/ApiSettings.tsx:30
+#: src/views/settings/components/CreateAPIKeyForm.tsx:54
 msgid "Create new key"
 msgstr "Créer une nouvelle clé"
 
 #: src/views/board/components/NewCardForm.tsx:394
-#: src/views/card/components/LabelSelector.tsx:97
+#: src/views/card/components/LabelSelector.tsx:98
 msgid "Create new label"
 msgstr "Créer une nouvelle étiquette"
 
@@ -519,7 +478,7 @@ msgstr "Créer une nouvelle étiquette"
 msgid "Create new list"
 msgstr "Créer une nouvelle liste"
 
-#: src/components/NewWorkspaceForm.tsx:384
+#: src/components/NewWorkspaceForm.tsx:94
 #: src/components/WorkspaceMenu.tsx:116
 msgid "Create workspace"
 msgstr "Créer un espace de travail"
@@ -532,10 +491,6 @@ msgstr "a créé la carte"
 msgid "Critical"
 msgstr "Critique"
 
-#: src/views/settings/components/Avatar.tsx:275
-msgid "Crop your avatar"
-msgstr "Recadrez votre avatar"
-
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:19
 msgid "Current password is required"
 msgstr "Le mot de passe actuel est requis"
@@ -544,14 +499,9 @@ msgstr "Le mot de passe actuel est requis"
 msgid "Custom domain"
 msgstr "Domaine personnalisé"
 
-#: src/components/NewWorkspaceForm.tsx:315
-msgid "Custom URLs require upgrading to a Pro plan"
-msgstr "Les URL personnalisées nécessitent une mise à niveau vers un forfait Pro"
-
-#: src/components/NewWorkspaceForm.tsx:339
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:74
-msgid "Custom workspace URL"
-msgstr "URL d'espace de travail personnalisée"
+#: src/views/settings/components/CustomURLConfirmation.tsx:45
+msgid "Custom URLs are a premium feature. You'll be directed to upgrade your account."
+msgstr "Les URL personnalisées sont une fonctionnalité premium. Vous serez dirigé vers la mise à niveau de votre compte."
 
 #: src/views/boards/components/TemplateBoards.tsx:41
 msgid "Customer Support"
@@ -569,9 +519,9 @@ msgstr "Sombre"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/views/settings/AccountSettings.tsx:52
-#: src/views/settings/AccountSettings.tsx:62
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:96
+#: src/views/settings/index.tsx:309
+#: src/views/settings/index.tsx:319
 msgid "Delete account"
 msgstr "Supprimer le compte"
 
@@ -592,8 +542,8 @@ msgid "Delete list"
 msgstr "Supprimer la liste"
 
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:106
-#: src/views/settings/WorkspaceSettings.tsx:96
-#: src/views/settings/WorkspaceSettings.tsx:107
+#: src/views/settings/index.tsx:272
+#: src/views/settings/index.tsx:283
 msgid "Delete workspace"
 msgstr "Supprimer l'espace de travail"
 
@@ -619,7 +569,7 @@ msgstr "a supprimé l'élément <0>{0}</0> de la checklist"
 msgid "Design"
 msgstr "Design"
 
-#: src/views/settings/IntegrationsSettings.tsx:108
+#: src/views/settings/index.tsx:250
 msgid "Disconnect Trello"
 msgstr "Déconnecter Trello"
 
@@ -627,7 +577,7 @@ msgstr "Déconnecter Trello"
 msgid "Discuss and collaborate on cards."
 msgstr "Discutez et collaborez sur les cartes."
 
-#: src/views/settings/AccountSettings.tsx:35
+#: src/views/settings/index.tsx:151
 msgid "Display name"
 msgstr "Nom d'affichage"
 
@@ -697,7 +647,7 @@ msgstr "Édition"
 msgid "email"
 msgstr "e-mail"
 
-#: src/views/members/components/InviteMemberForm.tsx:161
+#: src/views/members/components/InviteMemberForm.tsx:163
 msgid "Email"
 msgstr "E-mail"
 
@@ -745,12 +695,12 @@ msgstr "Erreur lors de la suppression de l'étiquette"
 msgid "Error deleting workspace"
 msgstr "Erreur lors de la suppression de l'espace de travail"
 
-#: src/views/settings/IntegrationsSettings.tsx:60
+#: src/views/settings/index.tsx:101
 msgid "Error disconnecting Trello"
 msgstr "Erreur lors de la déconnexion de Trello"
 
-#: src/views/members/components/InviteMemberForm.tsx:71
-#: src/views/members/components/InviteMemberForm.tsx:77
+#: src/views/members/components/InviteMemberForm.tsx:76
+#: src/views/members/components/InviteMemberForm.tsx:82
 msgid "Error inviting member"
 msgstr "Erreur lors de l'invitation du membre"
 
@@ -758,7 +708,7 @@ msgstr "Erreur lors de l'invitation du membre"
 msgid "Error updating display name"
 msgstr "Erreur lors de la mise à jour du nom d'affichage"
 
-#: src/views/settings/components/Avatar.tsx:80
+#: src/views/settings/components/Avatar.tsx:39
 msgid "Error updating profile image"
 msgstr "Erreur lors de la mise à jour de l'image de profil"
 
@@ -774,17 +724,12 @@ msgstr "Erreur lors de la mise à jour du nom de l'espace de travail"
 msgid "Error updating workspace URL"
 msgstr "Erreur lors de la mise à jour de l'URL de l'espace de travail"
 
-#: src/views/members/components/InviteMemberForm.tsx:130
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:41
+#: src/views/members/components/InviteMemberForm.tsx:132
 msgid "Error upgrading subscription"
 msgstr "Erreur lors de la mise à niveau de l'abonnement"
 
-#: src/components/NewWorkspaceForm.tsx:142
-msgid "Error upgrading to Pro"
-msgstr "Erreur lors de la mise à niveau vers Pro"
-
-#: src/views/settings/components/Avatar.tsx:94
-#: src/views/settings/components/Avatar.tsx:221
+#: src/views/settings/components/Avatar.tsx:56
+#: src/views/settings/components/Avatar.tsx:97
 msgid "Error uploading profile image"
 msgstr "Erreur lors du téléchargement de l'image de profil"
 
@@ -849,8 +794,8 @@ msgstr "Pour une durabilité à long terme, nous reconnaissons que tous les bons
 msgid "Free"
 msgstr "Gratuit"
 
-#: src/views/members/components/InviteMemberForm.tsx:193
-#: src/views/members/index.tsx:208
+#: src/views/members/components/InviteMemberForm.tsx:192
+#: src/views/members/index.tsx:184
 msgid "Free Plan"
 msgstr "Forfait gratuit"
 
@@ -959,7 +904,7 @@ msgstr "Idées"
 msgid "Ideas to improve this page..."
 msgstr "Idées pour améliorer cette page..."
 
-#: src/views/boards/index.tsx:43
+#: src/views/boards/index.tsx:38
 msgid "Import"
 msgstr "Importer"
 
@@ -997,7 +942,6 @@ msgstr "En cours"
 msgid "Individuals"
 msgstr "Particuliers"
 
-#: src/components/SettingsLayout.tsx:57
 #: src/views/home/components/Features.tsx:114
 msgid "Integrations"
 msgstr "Intégrations"
@@ -1006,24 +950,24 @@ msgstr "Intégrations"
 msgid "Interviewing"
 msgstr "Entretien"
 
-#: src/views/members/components/InviteMemberForm.tsx:40
+#: src/views/members/components/InviteMemberForm.tsx:45
 msgid "Invalid email address"
 msgstr "Adresse e-mail invalide"
 
-#: src/views/members/index.tsx:221
+#: src/views/members/index.tsx:193
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/views/members/components/InviteMemberForm.tsx:208
+#: src/views/members/components/InviteMemberForm.tsx:207
 msgid "Invite another"
 msgstr "Inviter un autre"
 
-#: src/views/card/components/MemberSelector.tsx:111
-#: src/views/members/components/InviteMemberForm.tsx:233
+#: src/views/card/components/MemberSelector.tsx:112
+#: src/views/members/components/InviteMemberForm.tsx:231
 msgid "Invite member"
 msgstr "Inviter un membre"
 
-#: src/views/members/components/InviteMemberForm.tsx:196
+#: src/views/members/components/InviteMemberForm.tsx:195
 msgid "Inviting members requires a Team Plan. You'll be redirected to upgrade your workspace."
 msgstr "L'invitation de membres nécessite un forfait d'équipe. Vous serez redirigé pour mettre à niveau votre espace de travail."
 
@@ -1054,23 +998,10 @@ msgstr "Étiquettes"
 msgid "Labels & Filters"
 msgstr "Étiquettes & filtres"
 
-#: src/views/settings/AccountSettings.tsx:42
+#: src/views/settings/index.tsx:187
 msgid "Language"
 msgstr "Langue"
 
-#: src/components/NewWorkspaceForm.tsx:332
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:67
-msgid "Launch offer"
-msgstr "Offre de lancement"
-
-#: src/views/members/index.tsx:191
-msgid "Launch offer: Get unlimited members with Pro"
-msgstr "Offre de lancement : obtenez des membres illimités avec Pro"
-
-#: src/views/home/components/Pricing.tsx:99
-msgid "Launch offer: unlimited seats for just $29/month with Pro"
-msgstr "Offre de lancement : sièges illimités pour seulement 29 $/mois avec Pro"
-
 #: src/views/boards/components/TemplateBoards.tsx:83
 msgid "Learning"
 msgstr "Apprentissage"
@@ -1136,12 +1067,12 @@ msgstr "Priorité moyenne"
 #: src/views/board/components/Filters.tsx:93
 #: src/views/board/components/NewCardForm.tsx:357
 #: src/views/card/index.tsx:125
-#: src/views/members/index.tsx:178
+#: src/views/members/index.tsx:171
 msgid "Members"
 msgstr "Membres"
 
 #. placeholder {0}: workspace.name ?? "Workspace"
-#: src/views/members/index.tsx:173
+#: src/views/members/index.tsx:167
 msgid "Members | {0}"
 msgstr "Membres | {0}"
 
@@ -1149,7 +1080,7 @@ msgstr "Membres | {0}"
 msgid "Monthly"
 msgstr "Mensuel"
 
-#: src/views/members/components/InviteMemberForm.tsx:93
+#: src/views/members/components/InviteMemberForm.tsx:92
 msgid "monthly billing"
 msgstr "facturation mensuelle"
 
@@ -1172,14 +1103,10 @@ msgstr "Nom"
 msgid "Need help?"
 msgstr "Besoin d'aide ?"
 
-#: src/views/boards/index.tsx:53
+#: src/views/boards/index.tsx:48
 msgid "New"
 msgstr "Nouveau"
 
-#: src/views/settings/components/NewApiKeyModal.tsx:147
-msgid "New API key"
-msgstr "Nouvelle clé API"
-
 #: src/views/boards/components/NewBoardForm.tsx:85
 msgid "New board"
 msgstr "Nouveau tableau"
@@ -1217,7 +1144,7 @@ msgstr "Le nouveau mot de passe doit être différent du mot de passe actuel"
 msgid "New Ticket"
 msgstr "Nouveau ticket"
 
-#: src/components/NewWorkspaceForm.tsx:240
+#: src/components/NewWorkspaceForm.tsx:65
 msgid "New workspace"
 msgstr "Nouvel espace de travail"
 
@@ -1253,11 +1180,11 @@ msgstr "Offre"
 msgid "Onboarding"
 msgstr "Intégration"
 
-#: src/views/settings/AccountSettings.tsx:55
+#: src/views/settings/index.tsx:312
 msgid "Once you delete your account, there is no going back. This action cannot be undone."
 msgstr "Une fois que vous supprimez votre compte, il n'y a pas de retour possible. Cette action ne peut pas être annulée."
 
-#: src/views/settings/WorkspaceSettings.tsx:99
+#: src/views/settings/index.tsx:275
 msgid "Once you delete your workspace, there is no going back. This action cannot be undone."
 msgstr "Une fois que vous supprimez votre espace de travail, il n'y a pas de retour possible. Cette action ne peut pas être annulée."
 
@@ -1289,15 +1216,11 @@ msgstr "Le mot de passe doit comporter au moins 8 caractères"
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: src/views/members/index.tsx:134
-msgid "Paused"
-msgstr "En pause"
-
-#: src/views/home/components/Pricing.tsx:102
+#: src/views/home/components/Pricing.tsx:96
 msgid "Payment frequency"
 msgstr "Fréquence de paiement"
 
-#: src/views/members/index.tsx:134
+#: src/views/members/index.tsx:128
 msgid "Pending"
 msgstr "En attente"
 
@@ -1330,13 +1253,13 @@ msgstr "Veuillez saisir un nom valide"
 msgid "Please enter a valid password"
 msgstr "Veuillez saisir un mot de passe valide"
 
-#: src/views/settings/components/Avatar.tsx:95
+#: src/views/settings/components/Avatar.tsx:57
 msgid "Please select a file to upload."
 msgstr "Veuillez sélectionner un fichier à télécharger."
 
 #: src/components/DeleteLabelConfirmation.tsx:26
 #: src/components/FeedbackModal.tsx:41
-#: src/components/NewWorkspaceForm.tsx:155
+#: src/components/NewWorkspaceForm.tsx:42
 #: src/views/board/components/NewCardForm.tsx:174
 #: src/views/board/components/NewListForm.tsx:78
 #: src/views/board/components/UpdateBoardSlugForm.tsx:72
@@ -1351,25 +1274,24 @@ msgstr "Veuillez sélectionner un fichier à télécharger."
 #: src/views/card/components/DeleteCardConfirmation.tsx:52
 #: src/views/card/components/DeleteChecklistConfirmation.tsx:37
 #: src/views/card/components/DeleteCommentConfirmation.tsx:45
-#: src/views/card/components/LabelSelector.tsx:72
-#: src/views/card/components/ListSelector.tsx:52
-#: src/views/card/components/MemberSelector.tsx:79
+#: src/views/card/components/LabelSelector.tsx:73
+#: src/views/card/components/ListSelector.tsx:53
+#: src/views/card/components/MemberSelector.tsx:80
 #: src/views/card/components/NewChecklistForm.tsx:70
 #: src/views/card/components/NewChecklistItemForm.tsx:89
 #: src/views/card/components/NewCommentForm.tsx:31
 #: src/views/card/index.tsx:173
 #: src/views/members/components/DeleteMemberConfirmation.tsx:28
-#: src/views/members/components/InviteMemberForm.tsx:78
-#: src/views/members/components/InviteMemberForm.tsx:131
-#: src/views/settings/components/Avatar.tsx:81
-#: src/views/settings/components/Avatar.tsx:222
+#: src/views/members/components/InviteMemberForm.tsx:83
+#: src/views/members/components/InviteMemberForm.tsx:133
+#: src/views/settings/components/Avatar.tsx:40
+#: src/views/settings/components/Avatar.tsx:98
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:40
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:46
 #: src/views/settings/components/UpdateDisplayNameForm.tsx:55
 #: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:62
 #: src/views/settings/components/UpdateWorkspaceNameForm.tsx:57
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:74
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:42
 msgid "Please try again later, or contact customer support."
 msgstr "Veuillez réessayer plus tard ou contacter le service client."
 
@@ -1380,7 +1302,6 @@ msgid "Pricing"
 msgstr "Tarifs"
 
 #: src/views/home/components/Pricing.tsx:56
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:91
 msgid "Priority email support"
 msgstr "Support par e-mail prioritaire"
 
@@ -1392,19 +1313,11 @@ msgstr "Politique de confidentialité"
 msgid "Private"
 msgstr "Privé"
 
-#: src/views/members/index.tsx:205
-msgid "Pro Plan"
-msgstr "Plan Pro"
-
-#: src/views/members/components/InviteMemberForm.tsx:182
-msgid "Pro Plan ∞"
-msgstr "Plan Pro ∞"
-
-#: src/views/settings/components/Avatar.tsx:67
+#: src/views/settings/components/Avatar.tsx:26
 msgid "Profile image updated"
 msgstr "Image de profil mise à jour"
 
-#: src/views/settings/AccountSettings.tsx:29
+#: src/views/settings/index.tsx:146
 msgid "Profile picture"
 msgstr "Photo de profil"
 
@@ -1440,7 +1353,7 @@ msgstr "À distance"
 msgid "Remove"
 msgstr "Supprimer"
 
-#: src/views/members/index.tsx:148
+#: src/views/members/index.tsx:142
 msgid "Remove member"
 msgstr "Supprimer le membre"
 
@@ -1487,12 +1400,16 @@ msgstr "Ressources"
 msgid "Review"
 msgstr "Révision"
 
+#: src/views/settings/components/CreateAPIKeyForm.tsx:49
+msgid "Revoke"
+msgstr "Révoquer"
+
 #: src/views/home/components/Footer.tsx:36
 #: src/views/home/components/Header.tsx:13
 msgid "Roadmap"
 msgstr "Feuille de route"
 
-#: src/views/members/index.tsx:243
+#: src/views/members/index.tsx:215
 msgid "Role"
 msgstr "Rôle"
 
@@ -1501,7 +1418,6 @@ msgid "Run on your own infrastructure"
 msgstr "Exécutez sur votre propre infrastructure"
 
 #: src/views/card/components/Comment.tsx:165
-#: src/views/settings/components/Avatar.tsx:312
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -1541,30 +1457,15 @@ msgstr "Envoyer des commentaires"
 msgid "Senior"
 msgstr "Senior"
 
-#: src/components/SettingsLayout.tsx:82
 #: src/components/SideNavigation.tsx:78
+#: src/views/settings/index.tsx:140
 msgid "Settings"
 msgstr "Paramètres"
 
-#: src/views/settings/AccountSettings.tsx:25
-msgid "Settings | Account"
-msgstr "Paramètres | Compte"
-
-#: src/views/settings/ApiSettings.tsx:18
-msgid "Settings | API"
-msgstr "Paramètres | API"
-
-#: src/views/settings/BillingSettings.tsx:35
-msgid "Settings | Billing"
-msgstr "Paramètres | Facturation"
-
-#: src/views/settings/IntegrationsSettings.tsx:69
-msgid "Settings | Integrations"
-msgstr "Paramètres | Intégrations"
-
-#: src/views/settings/WorkspaceSettings.tsx:54
-msgid "Settings | Workspace"
-msgstr "Paramètres | Espace de travail"
+#. placeholder {0}: workspace.name ?? "Workspace"
+#: src/views/settings/index.tsx:136
+msgid "Settings | {0}"
+msgstr "Paramètres | {0}"
 
 #: src/views/home/components/Header.tsx:100
 #: src/views/home/components/Header.tsx:138
@@ -1613,10 +1514,6 @@ msgstr "Étoile sur Github"
 msgid "Success"
 msgstr "Succès"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:55
-msgid "Supercharge your workspace for just $29/month. Here's what you'll get:"
-msgstr "Optimisez votre espace de travail pour seulement 29 $/mois. Voici ce que vous obtiendrez :"
-
 #: src/components/UserMenu.tsx:180
 msgid "Support"
 msgstr "Assistance"
@@ -1629,8 +1526,8 @@ msgstr "Soutenir le développement du projet"
 msgid "System"
 msgstr "Système"
 
-#: src/views/members/components/InviteMemberForm.tsx:182
-#: src/views/members/index.tsx:207
+#: src/views/members/components/InviteMemberForm.tsx:183
+#: src/views/members/index.tsx:184
 msgid "Team Plan"
 msgstr "Forfait d'équipe"
 
@@ -1682,10 +1579,6 @@ msgstr "Ils ne pourront plus accéder à cet espace de travail."
 msgid "This action can't be undone."
 msgstr "Cette action ne peut pas être annulée."
 
-#: src/views/settings/components/NewApiKeyModal.tsx:129
-msgid "This API key will only be shown once. Please save it in a secure location."
-msgstr "Cette clé API ne sera affichée qu'une seule fois. Veuillez la sauvegarder dans un emplacement sécurisé."
-
 #: src/views/public/board/index.tsx:151
 msgid "This board is private or does not exist"
 msgstr "Ce tableau est privé ou n'existe pas"
@@ -1702,14 +1595,6 @@ msgstr "Cela entraînera la suppression définitive de toutes les données assoc
 msgid "This will result in the permanent deletion of all data associated with your account."
 msgstr "Cela entraînera la suppression définitive de toutes les données associées à votre compte."
 
-#: src/components/NewWorkspaceForm.tsx:284
-msgid "This workspace URL has already been taken"
-msgstr "Cette URL d'espace de travail est déjà prise"
-
-#: src/components/NewWorkspaceForm.tsx:286
-msgid "This workspace URL is reserved"
-msgstr "Cette URL d'espace de travail est réservée"
-
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:123
 msgid "This workspace username has already been taken"
 msgstr "Ce nom d'utilisateur d'espace de travail est déjà pris"
@@ -1727,11 +1612,7 @@ msgstr "Basculer le menu"
 msgid "Track all card changes with detailed activity history."
 msgstr "Suivez tous les changements de cartes avec un historique d'activité détaillé."
 
-#: src/views/settings/IntegrationsSettings.tsx:73
-msgid "Trello"
-msgstr "Trello"
-
-#: src/views/settings/IntegrationsSettings.tsx:53
+#: src/views/settings/index.tsx:94
 msgid "Trello disconnected"
 msgstr "Trello déconnecté"
 
@@ -1763,7 +1644,7 @@ msgstr "Impossible de créer la liste de contrôle"
 msgid "Unable to create list"
 msgstr "Impossible de créer une liste"
 
-#: src/components/NewWorkspaceForm.tsx:154
+#: src/components/NewWorkspaceForm.tsx:41
 msgid "Unable to create workspace"
 msgstr "Impossible de créer l'espace de travail"
 
@@ -1816,16 +1697,16 @@ msgstr "Impossible de mettre à jour l'élément de la liste de contrôle"
 msgid "Unable to update comment"
 msgstr "Impossible de mettre à jour le commentaire"
 
-#: src/views/card/components/LabelSelector.tsx:71
+#: src/views/card/components/LabelSelector.tsx:72
 msgid "Unable to update labels"
 msgstr "Impossible de mettre à jour les étiquettes"
 
 #: src/views/board/index.tsx:133
-#: src/views/card/components/ListSelector.tsx:51
+#: src/views/card/components/ListSelector.tsx:52
 msgid "Unable to update list"
 msgstr "Impossible de mettre à jour la liste"
 
-#: src/views/card/components/MemberSelector.tsx:78
+#: src/views/card/components/MemberSelector.tsx:79
 msgid "Unable to update members"
 msgstr "Impossible de mettre à jour les membres"
 
@@ -1862,15 +1743,10 @@ msgstr "Commentaires illimités"
 msgid "Unlimited lists"
 msgstr "Listes illimitées"
 
-#: src/components/NewWorkspaceForm.tsx:329
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:64
-msgid "Unlimited members"
-msgstr "Membres illimités"
-
 #: src/views/board/components/UpdateBoardSlugForm.tsx:174
-#: src/views/settings/components/UpdateDisplayNameForm.tsx:80
-#: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:91
-#: src/views/settings/components/UpdateWorkspaceNameForm.tsx:83
+#: src/views/settings/components/UpdateDisplayNameForm.tsx:79
+#: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:90
+#: src/views/settings/components/UpdateWorkspaceNameForm.tsx:82
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:154
 msgid "Update"
 msgstr "Mettre à jour"
@@ -1896,20 +1772,11 @@ msgstr "a mis à jour le titre"
 msgid "updated the title to <0>{0}</0>"
 msgstr "a mis à jour le titre en <0>{0}</0>"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:109
+#: src/views/settings/components/CustomURLConfirmation.tsx:52
 msgid "Upgrade"
 msgstr "Mettre à niveau"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:52
-#: src/views/settings/WorkspaceSettings.tsx:89
-msgid "Upgrade to Pro"
-msgstr "Passer à Pro"
-
-#: src/components/NewWorkspaceForm.tsx:369
-msgid "Upgrade to Pro ($29/month)"
-msgstr "Passer à Pro (29 $/mois)"
-
-#: src/views/members/components/InviteMemberForm.tsx:224
+#: src/views/members/components/InviteMemberForm.tsx:222
 msgid "Upgrade to Team Plan"
 msgstr "Passer au forfait d'équipe"
 
@@ -1918,17 +1785,14 @@ msgstr "Passer au forfait d'équipe"
 msgid "Urgent"
 msgstr "Urgent"
 
-#: src/components/NewWorkspaceForm.tsx:35
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:36
 msgid "URL can only contain letters, numbers, and hyphens"
 msgstr "L'URL ne peut contenir que des lettres, des chiffres et des traits d'union"
 
-#: src/components/NewWorkspaceForm.tsx:33
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:34
 msgid "URL cannot exceed 24 characters"
 msgstr "L'URL ne peut pas dépasser 24 caractères"
 
-#: src/components/NewWorkspaceForm.tsx:31
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:32
 msgid "URL must be at least 3 characters long"
 msgstr "L'URL doit comporter au moins 3 caractères"
@@ -1937,11 +1801,11 @@ msgstr "L'URL doit comporter au moins 3 caractères"
 msgid "Use template"
 msgstr "Utiliser le modèle"
 
-#: src/views/members/index.tsx:237
+#: src/views/members/index.tsx:209
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/views/members/components/InviteMemberForm.tsx:72
+#: src/views/members/components/InviteMemberForm.tsx:77
 msgid "User is already a member of this workspace"
 msgstr "L'utilisateur est déjà membre de cet espace de travail"
 
@@ -1949,11 +1813,11 @@ msgstr "L'utilisateur est déjà membre de cet espace de travail"
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/views/settings/ApiSettings.tsx:25
+#: src/views/settings/index.tsx:262
 msgid "View and manage your API keys."
 msgstr "Consultez et gérez vos clés API."
 
-#: src/views/settings/BillingSettings.tsx:42
+#: src/views/settings/index.tsx:201
 msgid "View and manage your billing and subscription."
 msgstr "Consultez et gérez votre facturation et votre abonnement."
 
@@ -2005,20 +1869,15 @@ msgstr "Quand Trello a été lancé en 2011, il a impressionné tout le monde pa
 msgid "Why make an open source Trello?"
 msgstr "Pourquoi créer un Trello open source ?"
 
-#: src/components/SettingsLayout.tsx:39
 #: src/views/board/index.tsx:331
 msgid "Workspace"
 msgstr "Espace de travail"
 
-#: src/components/NewWorkspaceForm.tsx:143
-msgid "Workspace created successfully. You can upgrade later in settings."
-msgstr "Espace de travail créé avec succès. Vous pourrez effectuer la mise à niveau ultérieurement dans les paramètres."
-
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:26
 msgid "Workspace deleted"
 msgstr "Espace de travail supprimé"
 
-#: src/views/settings/WorkspaceSettings.tsx:75
+#: src/views/settings/index.tsx:177
 msgid "Workspace description"
 msgstr "Description de l'espace de travail"
 
@@ -2039,8 +1898,8 @@ msgstr "Description de l'espace de travail mise à jour"
 msgid "Workspace members"
 msgstr "Membres de l'espace de travail"
 
-#: src/components/NewWorkspaceForm.tsx:259
-#: src/views/settings/WorkspaceSettings.tsx:58
+#: src/components/NewWorkspaceForm.tsx:81
+#: src/views/settings/index.tsx:158
 msgid "Workspace name"
 msgstr "Nom de l'espace de travail"
 
@@ -2048,10 +1907,6 @@ msgstr "Nom de l'espace de travail"
 msgid "Workspace name cannot exceed 24 characters"
 msgstr "Le nom de l'espace de travail ne peut pas dépasser 24 caractères"
 
-#: src/components/NewWorkspaceForm.tsx:27
-msgid "Workspace name is required"
-msgstr "Le nom de l'espace de travail est requis"
-
 #: src/views/settings/components/UpdateWorkspaceNameForm.tsx:14
 msgid "Workspace name must be at least 3 characters long"
 msgstr "Le nom de l'espace de travail doit comporter au moins 3 caractères"
@@ -2064,14 +1919,10 @@ msgstr "Nom de l'espace de travail mis à jour"
 msgid "Workspace slug updated"
 msgstr "Slug de l'espace de travail mis à jour"
 
-#: src/views/settings/WorkspaceSettings.tsx:66
+#: src/views/settings/index.tsx:167
 msgid "Workspace URL"
 msgstr "URL de l'espace de travail"
 
-#: src/components/NewWorkspaceForm.tsx:273
-msgid "workspace-url"
-msgstr "workspace-url"
-
 #: src/views/boards/components/TemplateBoards.tsx:30
 msgid "Writing"
 msgstr "Écriture"
@@ -2084,7 +1935,7 @@ msgstr "Annuel"
 msgid "Yes, we offer an forever free plan for individual use. No restrictions, no paywalls, no limits."
 msgstr "Oui, nous proposons un plan gratuit à vie pour un usage individuel. Aucune restriction, aucun paywall, aucune limite."
 
-#: src/views/settings/AccountSettings.tsx:73
+#: src/views/settings/index.tsx:294
 msgid "You are about to change your password."
 msgstr "Vous êtes sur le point de modifier votre mot de passe."
 
@@ -2108,10 +1959,6 @@ msgstr "Vous vous êtes connecté avec succès."
 msgid "You have been signed up successfully."
 msgstr "Vous vous êtes inscrit avec succès."
 
-#: src/views/members/components/InviteMemberForm.tsx:186
-msgid "You have unlimited seats with your Pro Plan. There is no additional charge for new members!"
-msgstr "Vous disposez de places illimitées avec votre Plan Pro. Il n'y a pas de frais supplémentaires pour les nouveaux membres !"
-
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:28
 msgid "Your account has been deleted."
 msgstr "Votre compte a été supprimé."
@@ -2128,15 +1975,15 @@ msgstr "Votre nom d'affichage a été mis à jour."
 msgid "Your password has been changed."
 msgstr "Votre mot de passe a été modifié."
 
-#: src/views/settings/components/Avatar.tsx:68
+#: src/views/settings/components/Avatar.tsx:27
 msgid "Your profile image has been updated."
 msgstr "Votre image de profil a été mise à jour."
 
-#: src/views/settings/IntegrationsSettings.tsx:54
+#: src/views/settings/index.tsx:95
 msgid "Your Trello account has been disconnected."
 msgstr "Votre compte Trello a été déconnecté."
 
-#: src/views/settings/IntegrationsSettings.tsx:102
+#: src/views/settings/index.tsx:244
 msgid "Your Trello account is connected."
 msgstr "Votre compte Trello est connecté."
 

apps/web/src/locales/index.ts

@@ -1,4 +1,4 @@
-export const locales = ["en", "fr", "de", "es", "it", "nl", "ru"] as const;
+export const locales = ["en", "fr", "de", "es", "it", "nl"] as const;
 
 export type Locale = (typeof locales)[number];
 
@@ -11,5 +11,4 @@ export const localeNames: Record<Locale, string> = {
   es: "Español",
   it: "Italiano",
   nl: "Nederlands",
-  ru: "Русский",
 };

apps/web/src/locales/it/messages.po

@@ -36,12 +36,12 @@ msgstr "{0} etichette"
 msgid "{boardCount, plural, one {Import board (1)} other {Import boards ({boardCount})}}"
 msgstr "{boardCount, plural, one {Importa bacheca (1)} other {Importa bacheche ({boardCount})}}"
 
-#: src/views/members/components/InviteMemberForm.tsx:92
-#: src/views/members/components/InviteMemberForm.tsx:104
+#: src/views/members/components/InviteMemberForm.tsx:91
+#: src/views/members/components/InviteMemberForm.tsx:106
 msgid "$10/month"
 msgstr "$10/mese"
 
-#: src/views/members/components/InviteMemberForm.tsx:104
+#: src/views/members/components/InviteMemberForm.tsx:106
 msgid "$8/month"
 msgstr "$8/mese"
 
@@ -53,10 +53,6 @@ msgstr "1 utente"
 msgid "A powerful, flexible kanban app that helps you organise work, track progress, and deliver results—all in one place."
 msgstr "Un'app kanban potente e flessibile che ti aiuta a organizzare il lavoro, monitorare i progressi e ottenere risultati, tutto in un unico posto."
 
-#: src/components/SettingsLayout.tsx:33
-msgid "Account"
-msgstr "Account"
-
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:27
 msgid "Account deleted"
 msgstr "Account eliminato"
@@ -95,13 +91,13 @@ msgstr "Aggiungi descrizione... (digita '/' per aprire i comandi o '@' per menzi
 msgid "Add details..."
 msgstr "Aggiungi dettagli..."
 
-#: src/views/card/components/LabelSelector.tsx:109
-#: src/views/card/components/LabelSelector.tsx:114
+#: src/views/card/components/LabelSelector.tsx:110
+#: src/views/card/components/LabelSelector.tsx:118
 msgid "Add label"
 msgstr "Aggiungi etichetta"
 
 #: src/views/card/components/MemberSelector.tsx:130
-#: src/views/members/components/InviteMemberForm.tsx:147
+#: src/views/members/components/InviteMemberForm.tsx:149
 msgid "Add member"
 msgstr "Aggiungi membro"
 
@@ -136,14 +132,10 @@ msgstr "ha aggiunto l'elemento <0>{0}</0> alla checklist"
 msgid "added label <0>{0}</0>"
 msgstr "ha aggiunto l'etichetta <0>{0}</0>"
 
-#: src/views/members/components/InviteMemberForm.tsx:187
+#: src/views/members/components/InviteMemberForm.tsx:186
 msgid "Adding a new member will cost an additional {price} ({billingType}) per seat."
 msgstr "L'aggiunta di un nuovo membro costerà un supplemento di {price} ({billingType}) per posto."
 
-#: src/views/settings/components/Avatar.tsx:278
-msgid "Adjust the square crop to fit your avatar."
-msgstr "Regola il ritaglio quadrato per adattarlo al tuo avatar."
-
 #: src/views/home/components/Pricing.tsx:55
 msgid "Admin roles"
 msgstr "Ruoli amministratore"
@@ -156,7 +148,7 @@ msgstr "Tutti i sistemi operativi"
 msgid "Already have an account? <0><1>Sign in</1></0>"
 msgstr "Hai già un account? <0><1>Accedi</1></0>"
 
-#: src/views/settings/IntegrationsSettings.tsx:61
+#: src/views/settings/index.tsx:102
 msgid "An error occurred while disconnecting your Trello account."
 msgstr "Si è verificato un errore durante la disconnessione del tuo account Trello."
 
@@ -164,27 +156,7 @@ msgstr "Si è verificato un errore durante la disconnessione del tuo account Tre
 msgid "An unexpected error occurred. Please try again later."
 msgstr "Si è verificato un errore imprevisto. Riprova più tardi."
 
-#: src/components/SettingsLayout.tsx:51
-msgid "API"
-msgstr "API"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:91
-msgid "API key created"
-msgstr "Chiave API creata"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:161
-msgid "API key name"
-msgstr "Nome chiave API"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:25
-msgid "API key name cannot exceed 30 characters"
-msgstr "Il nome della chiave API non può superare i 30 caratteri"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:24
-msgid "API key name is required"
-msgstr "Il nome della chiave API è obbligatorio"
-
-#: src/views/settings/ApiSettings.tsx:22
+#: src/views/settings/index.tsx:259
 msgid "API keys"
 msgstr "Chiavi API"
 
@@ -246,21 +218,20 @@ msgstr "Backlog"
 msgid "Basic Kanban"
 msgstr "Kanban base"
 
-#: src/views/members/components/InviteMemberForm.tsx:105
+#: src/views/members/components/InviteMemberForm.tsx:107
 msgid "billed annually"
 msgstr "fatturato annualmente"
 
-#: src/views/members/components/InviteMemberForm.tsx:105
+#: src/views/members/components/InviteMemberForm.tsx:107
 msgid "billed monthly"
 msgstr "fatturato mensilmente"
 
-#: src/components/SettingsLayout.tsx:44
 #: src/views/boards/components/TemplateBoards.tsx:55
-#: src/views/settings/BillingSettings.tsx:39
+#: src/views/settings/index.tsx:198
 msgid "Billing"
 msgstr "Fatturazione"
 
-#: src/views/settings/BillingSettings.tsx:49
+#: src/views/settings/index.tsx:208
 msgid "Billing portal"
 msgstr "Portale di fatturazione"
 
@@ -272,11 +243,6 @@ msgstr "Post del blog"
 msgid "Board"
 msgstr "Bacheca"
 
-#: src/components/NewWorkspaceForm.tsx:346
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:81
-msgid "Board analytics"
-msgstr "Analisi della bacheca"
-
 #: src/views/boards/components/NewBoardForm.tsx:21
 msgid "Board name cannot exceed 100 characters"
 msgstr "Il nome della bacheca non può superare i 100 caratteri"
@@ -315,12 +281,12 @@ msgid "Board visibility updated"
 msgstr "Visibilità della bacheca aggiornata"
 
 #: src/components/SideNavigation.tsx:68
-#: src/views/boards/index.tsx:32
+#: src/views/boards/index.tsx:27
 msgid "Boards"
 msgstr "Bacheche"
 
 #. placeholder {0}: workspace.name ?? "Workspace"
-#: src/views/boards/index.tsx:28
+#: src/views/boards/index.tsx:23
 msgid "Boards | {0}"
 msgstr "Bacheche | {0}"
 
@@ -342,11 +308,10 @@ msgstr "Segnalazione bug"
 #: src/views/card/components/DeleteChecklistConfirmation.tsx:63
 #: src/views/card/components/DeleteCommentConfirmation.tsx:76
 #: src/views/members/components/DeleteMemberConfirmation.tsx:55
-#: src/views/settings/components/Avatar.tsx:309
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:168
+#: src/views/settings/components/CustomURLConfirmation.tsx:50
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:88
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:98
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:104
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -358,16 +323,16 @@ msgstr "Carta non trovata"
 msgid "Card title"
 msgstr "Titolo della carta"
 
-#: src/views/settings/AccountSettings.tsx:70
-#: src/views/settings/AccountSettings.tsx:80
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:109
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:178
+#: src/views/settings/index.tsx:291
+#: src/views/settings/index.tsx:301
 msgid "Change Password"
 msgstr "Cambia password"
 
-#: src/views/settings/AccountSettings.tsx:45
-msgid "Change your language preferences."
-msgstr "Modifica le tue preferenze di lingua."
+#: src/views/settings/index.tsx:190
+msgid "Change the language of the app."
+msgstr "Cambia la lingua dell'app."
 
 #: src/views/auth/login/index.tsx:41
 #: src/views/auth/signup/index.tsx:67
@@ -387,10 +352,6 @@ msgstr "Cancella filtri"
 msgid "Click on the link we've sent to {magicLinkRecipient} to sign in."
 msgstr "Clicca sul link che abbiamo inviato a {magicLinkRecipient} per accedere."
 
-#: src/views/settings/components/NewApiKeyModal.tsx:136
-msgid "Close"
-msgstr "Chiudi"
-
 #: src/views/boards/components/TemplateBoards.tsx:22
 msgid "Code Review"
 msgstr "Revisione del codice"
@@ -399,9 +360,7 @@ msgstr "Revisione del codice"
 msgid "Collaborate seamlessly with your team."
 msgstr "Collabora senza problemi con il tuo team."
 
-#: src/components/NewWorkspaceForm.tsx:349
 #: src/views/home/components/Features.tsx:66
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:84
 msgid "Coming soon"
 msgstr "Prossimamente"
 
@@ -430,12 +389,16 @@ msgstr "ha completato un elemento della checklist"
 msgid "completed checklist item <0>{0}</0>"
 msgstr "ha completato l'elemento <0>{0}</0> della checklist"
 
+#: src/views/settings/components/CustomURLConfirmation.tsx:42
+msgid "Confirm URL change"
+msgstr "Conferma modifica URL"
+
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:150
 msgid "Confirm your new password"
 msgstr "Conferma la tua nuova password"
 
 #: src/views/boards/components/ImportBoardsForm.tsx:157
-#: src/views/settings/IntegrationsSettings.tsx:93
+#: src/views/settings/index.tsx:235
 msgid "Connect Trello"
 msgstr "Connetti Trello"
 
@@ -443,7 +406,7 @@ msgstr "Connetti Trello"
 msgid "Connect your favorite tools to streamline your workflow."
 msgstr "Connetti i tuoi strumenti preferiti per semplificare il tuo flusso di lavoro."
 
-#: src/views/settings/IntegrationsSettings.tsx:80
+#: src/views/settings/index.tsx:222
 msgid "Connect your Trello account to import boards."
 msgstr "Connetti il tuo account Trello per importare le bacheche."
 
@@ -478,10 +441,6 @@ msgstr "Controlla chi può visualizzare e modificare le tue bacheche."
 msgid "Create another"
 msgstr "Crea un altro"
 
-#: src/views/settings/components/NewApiKeyModal.tsx:175
-msgid "Create API key"
-msgstr "Crea chiave API"
-
 #: src/views/boards/components/NewBoardForm.tsx:128
 msgid "Create board"
 msgstr "Crea bacheca"
@@ -506,12 +465,12 @@ msgstr "Crea lista"
 msgid "Create new board"
 msgstr "Crea nuova bacheca"
 
-#: src/views/settings/ApiSettings.tsx:30
+#: src/views/settings/components/CreateAPIKeyForm.tsx:54
 msgid "Create new key"
 msgstr "Crea nuova chiave"
 
 #: src/views/board/components/NewCardForm.tsx:394
-#: src/views/card/components/LabelSelector.tsx:97
+#: src/views/card/components/LabelSelector.tsx:98
 msgid "Create new label"
 msgstr "Crea nuova etichetta"
 
@@ -519,7 +478,7 @@ msgstr "Crea nuova etichetta"
 msgid "Create new list"
 msgstr "Crea nuova lista"
 
-#: src/components/NewWorkspaceForm.tsx:384
+#: src/components/NewWorkspaceForm.tsx:94
 #: src/components/WorkspaceMenu.tsx:116
 msgid "Create workspace"
 msgstr "Crea spazio di lavoro"
@@ -532,10 +491,6 @@ msgstr "ha creato la carta"
 msgid "Critical"
 msgstr "Critico"
 
-#: src/views/settings/components/Avatar.tsx:275
-msgid "Crop your avatar"
-msgstr "Ritaglia il tuo avatar"
-
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:19
 msgid "Current password is required"
 msgstr "La password attuale è obbligatoria"
@@ -544,14 +499,9 @@ msgstr "La password attuale è obbligatoria"
 msgid "Custom domain"
 msgstr "Dominio personalizzato"
 
-#: src/components/NewWorkspaceForm.tsx:315
-msgid "Custom URLs require upgrading to a Pro plan"
-msgstr "Gli URL personalizzati richiedono l'aggiornamento a un piano Pro"
-
-#: src/components/NewWorkspaceForm.tsx:339
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:74
-msgid "Custom workspace URL"
-msgstr "URL personalizzato dell'area di lavoro"
+#: src/views/settings/components/CustomURLConfirmation.tsx:45
+msgid "Custom URLs are a premium feature. You'll be directed to upgrade your account."
+msgstr "Gli URL personalizzati sono una funzionalità premium. Sarai indirizzato all'aggiornamento del tuo account."
 
 #: src/views/boards/components/TemplateBoards.tsx:41
 msgid "Customer Support"
@@ -569,9 +519,9 @@ msgstr "Scuro"
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/views/settings/AccountSettings.tsx:52
-#: src/views/settings/AccountSettings.tsx:62
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:96
+#: src/views/settings/index.tsx:309
+#: src/views/settings/index.tsx:319
 msgid "Delete account"
 msgstr "Elimina account"
 
@@ -592,8 +542,8 @@ msgid "Delete list"
 msgstr "Elimina lista"
 
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:106
-#: src/views/settings/WorkspaceSettings.tsx:96
-#: src/views/settings/WorkspaceSettings.tsx:107
+#: src/views/settings/index.tsx:272
+#: src/views/settings/index.tsx:283
 msgid "Delete workspace"
 msgstr "Elimina spazio di lavoro"
 
@@ -619,7 +569,7 @@ msgstr "ha eliminato l'elemento <0>{0}</0> della checklist"
 msgid "Design"
 msgstr "Design"
 
-#: src/views/settings/IntegrationsSettings.tsx:108
+#: src/views/settings/index.tsx:250
 msgid "Disconnect Trello"
 msgstr "Disconnetti Trello"
 
@@ -627,7 +577,7 @@ msgstr "Disconnetti Trello"
 msgid "Discuss and collaborate on cards."
 msgstr "Discuti e collabora sulle schede."
 
-#: src/views/settings/AccountSettings.tsx:35
+#: src/views/settings/index.tsx:151
 msgid "Display name"
 msgstr "Nome visualizzato"
 
@@ -697,7 +647,7 @@ msgstr "Modifica"
 msgid "email"
 msgstr "email"
 
-#: src/views/members/components/InviteMemberForm.tsx:161
+#: src/views/members/components/InviteMemberForm.tsx:163
 msgid "Email"
 msgstr "Email"
 
@@ -745,12 +695,12 @@ msgstr "Errore durante l'eliminazione dell'etichetta"
 msgid "Error deleting workspace"
 msgstr "Errore durante l'eliminazione dell'area di lavoro"
 
-#: src/views/settings/IntegrationsSettings.tsx:60
+#: src/views/settings/index.tsx:101
 msgid "Error disconnecting Trello"
 msgstr "Errore durante la disconnessione da Trello"
 
-#: src/views/members/components/InviteMemberForm.tsx:71
-#: src/views/members/components/InviteMemberForm.tsx:77
+#: src/views/members/components/InviteMemberForm.tsx:76
+#: src/views/members/components/InviteMemberForm.tsx:82
 msgid "Error inviting member"
 msgstr "Errore durante l'invito del membro"
 
@@ -758,7 +708,7 @@ msgstr "Errore durante l'invito del membro"
 msgid "Error updating display name"
 msgstr "Errore durante l'aggiornamento del nome visualizzato"
 
-#: src/views/settings/components/Avatar.tsx:80
+#: src/views/settings/components/Avatar.tsx:39
 msgid "Error updating profile image"
 msgstr "Errore durante l'aggiornamento dell'immagine del profilo"
 
@@ -774,17 +724,12 @@ msgstr "Errore durante l'aggiornamento del nome dell'area di lavoro"
 msgid "Error updating workspace URL"
 msgstr "Errore durante l'aggiornamento dell'URL dell'area di lavoro"
 
-#: src/views/members/components/InviteMemberForm.tsx:130
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:41
+#: src/views/members/components/InviteMemberForm.tsx:132
 msgid "Error upgrading subscription"
 msgstr "Errore nell'aggiornamento dell'abbonamento"
 
-#: src/components/NewWorkspaceForm.tsx:142
-msgid "Error upgrading to Pro"
-msgstr "Errore durante l'aggiornamento a Pro"
-
-#: src/views/settings/components/Avatar.tsx:94
-#: src/views/settings/components/Avatar.tsx:221
+#: src/views/settings/components/Avatar.tsx:56
+#: src/views/settings/components/Avatar.tsx:97
 msgid "Error uploading profile image"
 msgstr "Errore durante il caricamento dell'immagine del profilo"
 
@@ -849,8 +794,8 @@ msgstr "Per la sostenibilità a lungo termine, riconosciamo che tutti i buoni pr
 msgid "Free"
 msgstr "Gratuito"
 
-#: src/views/members/components/InviteMemberForm.tsx:193
-#: src/views/members/index.tsx:208
+#: src/views/members/components/InviteMemberForm.tsx:192
+#: src/views/members/index.tsx:184
 msgid "Free Plan"
 msgstr "Piano gratuito"
 
@@ -959,7 +904,7 @@ msgstr "Idee"
 msgid "Ideas to improve this page..."
 msgstr "Idee per migliorare questa pagina..."
 
-#: src/views/boards/index.tsx:43
+#: src/views/boards/index.tsx:38
 msgid "Import"
 msgstr "Importa"
 
@@ -997,7 +942,6 @@ msgstr "In corso"
 msgid "Individuals"
 msgstr "Privati"
 
-#: src/components/SettingsLayout.tsx:57
 #: src/views/home/components/Features.tsx:114
 msgid "Integrations"
 msgstr "Integrazioni"
@@ -1006,24 +950,24 @@ msgstr "Integrazioni"
 msgid "Interviewing"
 msgstr "Colloquio"
 
-#: src/views/members/components/InviteMemberForm.tsx:40
+#: src/views/members/components/InviteMemberForm.tsx:45
 msgid "Invalid email address"
 msgstr "Indirizzo email non valido"
 
-#: src/views/members/index.tsx:221
+#: src/views/members/index.tsx:193
 msgid "Invite"
 msgstr "Invita"
 
-#: src/views/members/components/InviteMemberForm.tsx:208
+#: src/views/members/components/InviteMemberForm.tsx:207
 msgid "Invite another"
 msgstr "Invita un altro"
 
-#: src/views/card/components/MemberSelector.tsx:111
-#: src/views/members/components/InviteMemberForm.tsx:233
+#: src/views/card/components/MemberSelector.tsx:112
+#: src/views/members/components/InviteMemberForm.tsx:231
 msgid "Invite member"
 msgstr "Invita membro"
 
-#: src/views/members/components/InviteMemberForm.tsx:196
+#: src/views/members/components/InviteMemberForm.tsx:195
 msgid "Inviting members requires a Team Plan. You'll be redirected to upgrade your workspace."
 msgstr "L'invito di membri richiede un Piano Team. Sarai reindirizzato per aggiornare il tuo spazio di lavoro."
 
@@ -1054,23 +998,10 @@ msgstr "Etichette"
 msgid "Labels & Filters"
 msgstr "Etichette & Filtri"
 
-#: src/views/settings/AccountSettings.tsx:42
+#: src/views/settings/index.tsx:187
 msgid "Language"
 msgstr "Lingua"
 
-#: src/components/NewWorkspaceForm.tsx:332
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:67
-msgid "Launch offer"
-msgstr "Offerta di lancio"
-
-#: src/views/members/index.tsx:191
-msgid "Launch offer: Get unlimited members with Pro"
-msgstr "Offerta di lancio: ottieni membri illimitati con Pro"
-
-#: src/views/home/components/Pricing.tsx:99
-msgid "Launch offer: unlimited seats for just $29/month with Pro"
-msgstr "Offerta di lancio: posti illimitati a soli $29/mese con Pro"
-
 #: src/views/boards/components/TemplateBoards.tsx:83
 msgid "Learning"
 msgstr "Apprendimento"
@@ -1136,12 +1067,12 @@ msgstr "Media priorità"
 #: src/views/board/components/Filters.tsx:93
 #: src/views/board/components/NewCardForm.tsx:357
 #: src/views/card/index.tsx:125
-#: src/views/members/index.tsx:178
+#: src/views/members/index.tsx:171
 msgid "Members"
 msgstr "Membri"
 
 #. placeholder {0}: workspace.name ?? "Workspace"
-#: src/views/members/index.tsx:173
+#: src/views/members/index.tsx:167
 msgid "Members | {0}"
 msgstr "Membri | {0}"
 
@@ -1149,7 +1080,7 @@ msgstr "Membri | {0}"
 msgid "Monthly"
 msgstr "Mensile"
 
-#: src/views/members/components/InviteMemberForm.tsx:93
+#: src/views/members/components/InviteMemberForm.tsx:92
 msgid "monthly billing"
 msgstr "fatturazione mensile"
 
@@ -1172,14 +1103,10 @@ msgstr "Nome"
 msgid "Need help?"
 msgstr "Hai bisogno di aiuto?"
 
-#: src/views/boards/index.tsx:53
+#: src/views/boards/index.tsx:48
 msgid "New"
 msgstr "Nuovo"
 
-#: src/views/settings/components/NewApiKeyModal.tsx:147
-msgid "New API key"
-msgstr "Nuova chiave API"
-
 #: src/views/boards/components/NewBoardForm.tsx:85
 msgid "New board"
 msgstr "Nuova bacheca"
@@ -1217,7 +1144,7 @@ msgstr "La nuova password deve essere diversa dalla password attuale"
 msgid "New Ticket"
 msgstr "Nuovo ticket"
 
-#: src/components/NewWorkspaceForm.tsx:240
+#: src/components/NewWorkspaceForm.tsx:65
 msgid "New workspace"
 msgstr "Nuovo spazio di lavoro"
 
@@ -1253,11 +1180,11 @@ msgstr "Offerta"
 msgid "Onboarding"
 msgstr "Inserimento"
 
-#: src/views/settings/AccountSettings.tsx:55
+#: src/views/settings/index.tsx:312
 msgid "Once you delete your account, there is no going back. This action cannot be undone."
 msgstr "Una volta eliminato il tuo account, non si può tornare indietro. Questa azione non può essere annullata."
 
-#: src/views/settings/WorkspaceSettings.tsx:99
+#: src/views/settings/index.tsx:275
 msgid "Once you delete your workspace, there is no going back. This action cannot be undone."
 msgstr "Una volta eliminata l'area di lavoro, non si può tornare indietro. Questa azione non può essere annullata."
 
@@ -1289,15 +1216,11 @@ msgstr "La password deve contenere almeno 8 caratteri"
 msgid "Passwords do not match"
 msgstr "Le password non corrispondono"
 
-#: src/views/members/index.tsx:134
-msgid "Paused"
-msgstr "In pausa"
-
-#: src/views/home/components/Pricing.tsx:102
+#: src/views/home/components/Pricing.tsx:96
 msgid "Payment frequency"
 msgstr "Frequenza di pagamento"
 
-#: src/views/members/index.tsx:134
+#: src/views/members/index.tsx:128
 msgid "Pending"
 msgstr "In attesa"
 
@@ -1330,13 +1253,13 @@ msgstr "Inserisci un nome valido"
 msgid "Please enter a valid password"
 msgstr "Inserisci una password valida"
 
-#: src/views/settings/components/Avatar.tsx:95
+#: src/views/settings/components/Avatar.tsx:57
 msgid "Please select a file to upload."
 msgstr "Seleziona un file da caricare."
 
 #: src/components/DeleteLabelConfirmation.tsx:26
 #: src/components/FeedbackModal.tsx:41
-#: src/components/NewWorkspaceForm.tsx:155
+#: src/components/NewWorkspaceForm.tsx:42
 #: src/views/board/components/NewCardForm.tsx:174
 #: src/views/board/components/NewListForm.tsx:78
 #: src/views/board/components/UpdateBoardSlugForm.tsx:72
@@ -1351,25 +1274,24 @@ msgstr "Seleziona un file da caricare."
 #: src/views/card/components/DeleteCardConfirmation.tsx:52
 #: src/views/card/components/DeleteChecklistConfirmation.tsx:37
 #: src/views/card/components/DeleteCommentConfirmation.tsx:45
-#: src/views/card/components/LabelSelector.tsx:72
-#: src/views/card/components/ListSelector.tsx:52
-#: src/views/card/components/MemberSelector.tsx:79
+#: src/views/card/components/LabelSelector.tsx:73
+#: src/views/card/components/ListSelector.tsx:53
+#: src/views/card/components/MemberSelector.tsx:80
 #: src/views/card/components/NewChecklistForm.tsx:70
 #: src/views/card/components/NewChecklistItemForm.tsx:89
 #: src/views/card/components/NewCommentForm.tsx:31
 #: src/views/card/index.tsx:173
 #: src/views/members/components/DeleteMemberConfirmation.tsx:28
-#: src/views/members/components/InviteMemberForm.tsx:78
-#: src/views/members/components/InviteMemberForm.tsx:131
-#: src/views/settings/components/Avatar.tsx:81
-#: src/views/settings/components/Avatar.tsx:222
+#: src/views/members/components/InviteMemberForm.tsx:83
+#: src/views/members/components/InviteMemberForm.tsx:133
+#: src/views/settings/components/Avatar.tsx:40
+#: src/views/settings/components/Avatar.tsx:98
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:40
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:46
 #: src/views/settings/components/UpdateDisplayNameForm.tsx:55
 #: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:62
 #: src/views/settings/components/UpdateWorkspaceNameForm.tsx:57
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:74
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:42
 msgid "Please try again later, or contact customer support."
 msgstr "Riprova più tardi o contatta l'assistenza clienti."
 
@@ -1380,7 +1302,6 @@ msgid "Pricing"
 msgstr "Prezzi"
 
 #: src/views/home/components/Pricing.tsx:56
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:91
 msgid "Priority email support"
 msgstr "Supporto email prioritario"
 
@@ -1392,19 +1313,11 @@ msgstr "Informativa sulla privacy"
 msgid "Private"
 msgstr "Privato"
 
-#: src/views/members/index.tsx:205
-msgid "Pro Plan"
-msgstr "Piano Pro"
-
-#: src/views/members/components/InviteMemberForm.tsx:182
-msgid "Pro Plan ∞"
-msgstr "Piano Pro ∞"
-
-#: src/views/settings/components/Avatar.tsx:67
+#: src/views/settings/components/Avatar.tsx:26
 msgid "Profile image updated"
 msgstr "Immagine del profilo aggiornata"
 
-#: src/views/settings/AccountSettings.tsx:29
+#: src/views/settings/index.tsx:146
 msgid "Profile picture"
 msgstr "Immagine del profilo"
 
@@ -1440,7 +1353,7 @@ msgstr "Remoto"
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: src/views/members/index.tsx:148
+#: src/views/members/index.tsx:142
 msgid "Remove member"
 msgstr "Rimuovi membro"
 
@@ -1487,12 +1400,16 @@ msgstr "Risorse"
 msgid "Review"
 msgstr "Revisione"
 
+#: src/views/settings/components/CreateAPIKeyForm.tsx:49
+msgid "Revoke"
+msgstr "Revoca"
+
 #: src/views/home/components/Footer.tsx:36
 #: src/views/home/components/Header.tsx:13
 msgid "Roadmap"
 msgstr "Roadmap"
 
-#: src/views/members/index.tsx:243
+#: src/views/members/index.tsx:215
 msgid "Role"
 msgstr "Ruolo"
 
@@ -1501,7 +1418,6 @@ msgid "Run on your own infrastructure"
 msgstr "Esegui sulla tua infrastruttura"
 
 #: src/views/card/components/Comment.tsx:165
-#: src/views/settings/components/Avatar.tsx:312
 msgid "Save"
 msgstr "Salva"
 
@@ -1541,30 +1457,15 @@ msgstr "Invia feedback"
 msgid "Senior"
 msgstr "Senior"
 
-#: src/components/SettingsLayout.tsx:82
 #: src/components/SideNavigation.tsx:78
+#: src/views/settings/index.tsx:140
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: src/views/settings/AccountSettings.tsx:25
-msgid "Settings | Account"
-msgstr "Impostazioni | Account"
-
-#: src/views/settings/ApiSettings.tsx:18
-msgid "Settings | API"
-msgstr "Impostazioni | API"
-
-#: src/views/settings/BillingSettings.tsx:35
-msgid "Settings | Billing"
-msgstr "Impostazioni | Fatturazione"
-
-#: src/views/settings/IntegrationsSettings.tsx:69
-msgid "Settings | Integrations"
-msgstr "Impostazioni | Integrazioni"
-
-#: src/views/settings/WorkspaceSettings.tsx:54
-msgid "Settings | Workspace"
-msgstr "Impostazioni | Area di lavoro"
+#. placeholder {0}: workspace.name ?? "Workspace"
+#: src/views/settings/index.tsx:136
+msgid "Settings | {0}"
+msgstr "Impostazioni | {0}"
 
 #: src/views/home/components/Header.tsx:100
 #: src/views/home/components/Header.tsx:138
@@ -1613,10 +1514,6 @@ msgstr "Metti una stella su Github"
 msgid "Success"
 msgstr "Operazione riuscita"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:55
-msgid "Supercharge your workspace for just $29/month. Here's what you'll get:"
-msgstr "Potenzia la tua area di lavoro per soli $29/mese. Ecco cosa otterrai:"
-
 #: src/components/UserMenu.tsx:180
 msgid "Support"
 msgstr "Supporto"
@@ -1629,8 +1526,8 @@ msgstr "Sostieni lo sviluppo del progetto"
 msgid "System"
 msgstr "Sistema"
 
-#: src/views/members/components/InviteMemberForm.tsx:182
-#: src/views/members/index.tsx:207
+#: src/views/members/components/InviteMemberForm.tsx:183
+#: src/views/members/index.tsx:184
 msgid "Team Plan"
 msgstr "Piano Team"
 
@@ -1682,10 +1579,6 @@ msgstr "Non potranno accedere a questo spazio di lavoro."
 msgid "This action can't be undone."
 msgstr "Questa azione non può essere annullata."
 
-#: src/views/settings/components/NewApiKeyModal.tsx:129
-msgid "This API key will only be shown once. Please save it in a secure location."
-msgstr "Questa chiave API verrà mostrata una sola volta. Salvala in un luogo sicuro."
-
 #: src/views/public/board/index.tsx:151
 msgid "This board is private or does not exist"
 msgstr "Questa bacheca è privata o non esiste"
@@ -1702,14 +1595,6 @@ msgstr "Questo comporterà l'eliminazione permanente di tutti i dati associati a
 msgid "This will result in the permanent deletion of all data associated with your account."
 msgstr "Questo comporterà l'eliminazione permanente di tutti i dati associati al tuo account."
 
-#: src/components/NewWorkspaceForm.tsx:284
-msgid "This workspace URL has already been taken"
-msgstr "Questo URL dello spazio di lavoro è già stato utilizzato"
-
-#: src/components/NewWorkspaceForm.tsx:286
-msgid "This workspace URL is reserved"
-msgstr "Questo URL dello spazio di lavoro è riservato"
-
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:123
 msgid "This workspace username has already been taken"
 msgstr "Questo nome utente dell'area di lavoro è già stato utilizzato"
@@ -1727,11 +1612,7 @@ msgstr "Attiva/disattiva menu"
 msgid "Track all card changes with detailed activity history."
 msgstr "Tieni traccia di tutte le modifiche alle schede con una cronologia dettagliata delle attività."
 
-#: src/views/settings/IntegrationsSettings.tsx:73
-msgid "Trello"
-msgstr "Trello"
-
-#: src/views/settings/IntegrationsSettings.tsx:53
+#: src/views/settings/index.tsx:94
 msgid "Trello disconnected"
 msgstr "Trello disconnesso"
 
@@ -1763,7 +1644,7 @@ msgstr "Impossibile creare la checklist"
 msgid "Unable to create list"
 msgstr "Impossibile creare la lista"
 
-#: src/components/NewWorkspaceForm.tsx:154
+#: src/components/NewWorkspaceForm.tsx:41
 msgid "Unable to create workspace"
 msgstr "Impossibile creare lo spazio di lavoro"
 
@@ -1816,16 +1697,16 @@ msgstr "Impossibile aggiornare l'elemento della checklist"
 msgid "Unable to update comment"
 msgstr "Impossibile aggiornare il commento"
 
-#: src/views/card/components/LabelSelector.tsx:71
+#: src/views/card/components/LabelSelector.tsx:72
 msgid "Unable to update labels"
 msgstr "Impossibile aggiornare le etichette"
 
 #: src/views/board/index.tsx:133
-#: src/views/card/components/ListSelector.tsx:51
+#: src/views/card/components/ListSelector.tsx:52
 msgid "Unable to update list"
 msgstr "Impossibile aggiornare la lista"
 
-#: src/views/card/components/MemberSelector.tsx:78
+#: src/views/card/components/MemberSelector.tsx:79
 msgid "Unable to update members"
 msgstr "Impossibile aggiornare i membri"
 
@@ -1862,15 +1743,10 @@ msgstr "Commenti illimitati"
 msgid "Unlimited lists"
 msgstr "Liste illimitate"
 
-#: src/components/NewWorkspaceForm.tsx:329
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:64
-msgid "Unlimited members"
-msgstr "Membri illimitati"
-
 #: src/views/board/components/UpdateBoardSlugForm.tsx:174
-#: src/views/settings/components/UpdateDisplayNameForm.tsx:80
-#: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:91
-#: src/views/settings/components/UpdateWorkspaceNameForm.tsx:83
+#: src/views/settings/components/UpdateDisplayNameForm.tsx:79
+#: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:90
+#: src/views/settings/components/UpdateWorkspaceNameForm.tsx:82
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:154
 msgid "Update"
 msgstr "Aggiorna"
@@ -1896,20 +1772,11 @@ msgstr "ha aggiornato il titolo"
 msgid "updated the title to <0>{0}</0>"
 msgstr "ha aggiornato il titolo in <0>{0}</0>"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:109
+#: src/views/settings/components/CustomURLConfirmation.tsx:52
 msgid "Upgrade"
 msgstr "Aggiorna"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:52
-#: src/views/settings/WorkspaceSettings.tsx:89
-msgid "Upgrade to Pro"
-msgstr "Passa a Pro"
-
-#: src/components/NewWorkspaceForm.tsx:369
-msgid "Upgrade to Pro ($29/month)"
-msgstr "Passa a Pro ($29/mese)"
-
-#: src/views/members/components/InviteMemberForm.tsx:224
+#: src/views/members/components/InviteMemberForm.tsx:222
 msgid "Upgrade to Team Plan"
 msgstr "Passa al Piano Team"
 
@@ -1918,17 +1785,14 @@ msgstr "Passa al Piano Team"
 msgid "Urgent"
 msgstr "Urgente"
 
-#: src/components/NewWorkspaceForm.tsx:35
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:36
 msgid "URL can only contain letters, numbers, and hyphens"
 msgstr "L'URL può contenere solo lettere, numeri e trattini"
 
-#: src/components/NewWorkspaceForm.tsx:33
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:34
 msgid "URL cannot exceed 24 characters"
 msgstr "L'URL non può superare i 24 caratteri"
 
-#: src/components/NewWorkspaceForm.tsx:31
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:32
 msgid "URL must be at least 3 characters long"
 msgstr "L'URL deve contenere almeno 3 caratteri"
@@ -1937,11 +1801,11 @@ msgstr "L'URL deve contenere almeno 3 caratteri"
 msgid "Use template"
 msgstr "Usa template"
 
-#: src/views/members/index.tsx:237
+#: src/views/members/index.tsx:209
 msgid "User"
 msgstr "Utente"
 
-#: src/views/members/components/InviteMemberForm.tsx:72
+#: src/views/members/components/InviteMemberForm.tsx:77
 msgid "User is already a member of this workspace"
 msgstr "L'utente è già membro di questo spazio di lavoro"
 
@@ -1949,11 +1813,11 @@ msgstr "L'utente è già membro di questo spazio di lavoro"
 msgid "Video"
 msgstr "Video"
 
-#: src/views/settings/ApiSettings.tsx:25
+#: src/views/settings/index.tsx:262
 msgid "View and manage your API keys."
 msgstr "Visualizza e gestisci le tue chiavi API."
 
-#: src/views/settings/BillingSettings.tsx:42
+#: src/views/settings/index.tsx:201
 msgid "View and manage your billing and subscription."
 msgstr "Visualizza e gestisci la tua fatturazione e abbonamento."
 
@@ -2005,20 +1869,15 @@ msgstr "Quando Trello fu lanciato nel 2011, stupì tutti con la sua semplicità
 msgid "Why make an open source Trello?"
 msgstr "Perché creare un Trello open source?"
 
-#: src/components/SettingsLayout.tsx:39
 #: src/views/board/index.tsx:331
 msgid "Workspace"
 msgstr "Spazio di lavoro"
 
-#: src/components/NewWorkspaceForm.tsx:143
-msgid "Workspace created successfully. You can upgrade later in settings."
-msgstr "Spazio di lavoro creato con successo. Puoi effettuare l'aggiornamento più tardi nelle impostazioni."
-
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:26
 msgid "Workspace deleted"
 msgstr "Spazio di lavoro eliminato"
 
-#: src/views/settings/WorkspaceSettings.tsx:75
+#: src/views/settings/index.tsx:177
 msgid "Workspace description"
 msgstr "Descrizione dello spazio di lavoro"
 
@@ -2039,8 +1898,8 @@ msgstr "Descrizione dell'area di lavoro aggiornata"
 msgid "Workspace members"
 msgstr "Membri del workspace"
 
-#: src/components/NewWorkspaceForm.tsx:259
-#: src/views/settings/WorkspaceSettings.tsx:58
+#: src/components/NewWorkspaceForm.tsx:81
+#: src/views/settings/index.tsx:158
 msgid "Workspace name"
 msgstr "Nome dello spazio di lavoro"
 
@@ -2048,10 +1907,6 @@ msgstr "Nome dello spazio di lavoro"
 msgid "Workspace name cannot exceed 24 characters"
 msgstr "Il nome dello spazio di lavoro non può superare i 24 caratteri"
 
-#: src/components/NewWorkspaceForm.tsx:27
-msgid "Workspace name is required"
-msgstr "Il nome dello spazio di lavoro è obbligatorio"
-
 #: src/views/settings/components/UpdateWorkspaceNameForm.tsx:14
 msgid "Workspace name must be at least 3 characters long"
 msgstr "Il nome dello spazio di lavoro deve contenere almeno 3 caratteri"
@@ -2064,14 +1919,10 @@ msgstr "Nome dello spazio di lavoro aggiornato"
 msgid "Workspace slug updated"
 msgstr "Slug dell'area di lavoro aggiornato"
 
-#: src/views/settings/WorkspaceSettings.tsx:66
+#: src/views/settings/index.tsx:167
 msgid "Workspace URL"
 msgstr "URL dello spazio di lavoro"
 
-#: src/components/NewWorkspaceForm.tsx:273
-msgid "workspace-url"
-msgstr "workspace-url"
-
 #: src/views/boards/components/TemplateBoards.tsx:30
 msgid "Writing"
 msgstr "Scrittura"
@@ -2084,7 +1935,7 @@ msgstr "Annuale"
 msgid "Yes, we offer an forever free plan for individual use. No restrictions, no paywalls, no limits."
 msgstr "Sì, offriamo un piano gratuito per sempre per uso individuale. Nessuna restrizione, nessun paywall, nessun limite."
 
-#: src/views/settings/AccountSettings.tsx:73
+#: src/views/settings/index.tsx:294
 msgid "You are about to change your password."
 msgstr "Stai per cambiare la tua password."
 
@@ -2108,10 +1959,6 @@ msgstr "Hai effettuato l'accesso con successo."
 msgid "You have been signed up successfully."
 msgstr "Ti sei registrato con successo."
 
-#: src/views/members/components/InviteMemberForm.tsx:186
-msgid "You have unlimited seats with your Pro Plan. There is no additional charge for new members!"
-msgstr "Hai posti illimitati con il tuo Piano Pro. Non ci sono costi aggiuntivi per i nuovi membri!"
-
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:28
 msgid "Your account has been deleted."
 msgstr "Il tuo account è stato eliminato."
@@ -2128,15 +1975,15 @@ msgstr "Il tuo nome visualizzato è stato aggiornato."
 msgid "Your password has been changed."
 msgstr "La tua password è stata modificata."
 
-#: src/views/settings/components/Avatar.tsx:68
+#: src/views/settings/components/Avatar.tsx:27
 msgid "Your profile image has been updated."
 msgstr "La tua immagine del profilo è stata aggiornata."
 
-#: src/views/settings/IntegrationsSettings.tsx:54
+#: src/views/settings/index.tsx:95
 msgid "Your Trello account has been disconnected."
 msgstr "Il tuo account Trello è stato disconnesso."
 
-#: src/views/settings/IntegrationsSettings.tsx:102
+#: src/views/settings/index.tsx:244
 msgid "Your Trello account is connected."
 msgstr "Il tuo account Trello è connesso."
 

apps/web/src/locales/nl/messages.po

@@ -36,12 +36,12 @@ msgstr "{0} labels"
 msgid "{boardCount, plural, one {Import board (1)} other {Import boards ({boardCount})}}"
 msgstr "{boardCount, plural, one {Bord importeren (1)} other {Borden importeren ({boardCount})}}"
 
-#: src/views/members/components/InviteMemberForm.tsx:92
-#: src/views/members/components/InviteMemberForm.tsx:104
+#: src/views/members/components/InviteMemberForm.tsx:91
+#: src/views/members/components/InviteMemberForm.tsx:106
 msgid "$10/month"
 msgstr "$10/maand"
 
-#: src/views/members/components/InviteMemberForm.tsx:104
+#: src/views/members/components/InviteMemberForm.tsx:106
 msgid "$8/month"
 msgstr "$8/maand"
 
@@ -53,10 +53,6 @@ msgstr "1 gebruiker"
 msgid "A powerful, flexible kanban app that helps you organise work, track progress, and deliver results—all in one place."
 msgstr "Een krachtige, flexibele kanban-app die je helpt werk te organiseren, voortgang bij te houden en resultaten te leveren—allemaal op één plek."
 
-#: src/components/SettingsLayout.tsx:33
-msgid "Account"
-msgstr "Account"
-
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:27
 msgid "Account deleted"
 msgstr "Account verwijderd"
@@ -95,13 +91,13 @@ msgstr "Beschrijving toevoegen... (typ '/' om commando's te openen of '@' om te
 msgid "Add details..."
 msgstr "Details toevoegen..."
 
-#: src/views/card/components/LabelSelector.tsx:109
-#: src/views/card/components/LabelSelector.tsx:114
+#: src/views/card/components/LabelSelector.tsx:110
+#: src/views/card/components/LabelSelector.tsx:118
 msgid "Add label"
 msgstr "Label toevoegen"
 
 #: src/views/card/components/MemberSelector.tsx:130
-#: src/views/members/components/InviteMemberForm.tsx:147
+#: src/views/members/components/InviteMemberForm.tsx:149
 msgid "Add member"
 msgstr "Lid toevoegen"
 
@@ -136,14 +132,10 @@ msgstr "heeft checklistitem <0>{0}</0> toegevoegd"
 msgid "added label <0>{0}</0>"
 msgstr "heeft label <0>{0}</0> toegevoegd"
 
-#: src/views/members/components/InviteMemberForm.tsx:187
+#: src/views/members/components/InviteMemberForm.tsx:186
 msgid "Adding a new member will cost an additional {price} ({billingType}) per seat."
 msgstr "Het toevoegen van een nieuw lid kost een extra {price} ({billingType}) per plaats."
 
-#: src/views/settings/components/Avatar.tsx:278
-msgid "Adjust the square crop to fit your avatar."
-msgstr "Pas de vierkante uitsnede aan zodat je avatar goed past."
-
 #: src/views/home/components/Pricing.tsx:55
 msgid "Admin roles"
 msgstr "Beheerdersrollen"
@@ -156,7 +148,7 @@ msgstr "Alle systemen operationeel"
 msgid "Already have an account? <0><1>Sign in</1></0>"
 msgstr "Heb je al een account? <0><1>Log in</1></0>"
 
-#: src/views/settings/IntegrationsSettings.tsx:61
+#: src/views/settings/index.tsx:102
 msgid "An error occurred while disconnecting your Trello account."
 msgstr "Er is een fout opgetreden bij het verbreken van de verbinding met je Trello-account."
 
@@ -164,27 +156,7 @@ msgstr "Er is een fout opgetreden bij het verbreken van de verbinding met je Tre
 msgid "An unexpected error occurred. Please try again later."
 msgstr "Er is een onverwachte fout opgetreden. Probeer het later opnieuw."
 
-#: src/components/SettingsLayout.tsx:51
-msgid "API"
-msgstr "API"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:91
-msgid "API key created"
-msgstr "API-sleutel aangemaakt"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:161
-msgid "API key name"
-msgstr "API-sleutelnaam"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:25
-msgid "API key name cannot exceed 30 characters"
-msgstr "API-sleutelnaam mag niet langer zijn dan 30 tekens"
-
-#: src/views/settings/components/NewApiKeyModal.tsx:24
-msgid "API key name is required"
-msgstr "API-sleutelnaam is verplicht"
-
-#: src/views/settings/ApiSettings.tsx:22
+#: src/views/settings/index.tsx:259
 msgid "API keys"
 msgstr "API-sleutels"
 
@@ -246,21 +218,20 @@ msgstr "Backlog"
 msgid "Basic Kanban"
 msgstr "Basis kanban"
 
-#: src/views/members/components/InviteMemberForm.tsx:105
+#: src/views/members/components/InviteMemberForm.tsx:107
 msgid "billed annually"
 msgstr "jaarlijks gefactureerd"
 
-#: src/views/members/components/InviteMemberForm.tsx:105
+#: src/views/members/components/InviteMemberForm.tsx:107
 msgid "billed monthly"
 msgstr "maandelijks gefactureerd"
 
-#: src/components/SettingsLayout.tsx:44
 #: src/views/boards/components/TemplateBoards.tsx:55
-#: src/views/settings/BillingSettings.tsx:39
+#: src/views/settings/index.tsx:198
 msgid "Billing"
 msgstr "Facturering"
 
-#: src/views/settings/BillingSettings.tsx:49
+#: src/views/settings/index.tsx:208
 msgid "Billing portal"
 msgstr "Factureringsportaal"
 
@@ -272,11 +243,6 @@ msgstr "Blogbericht"
 msgid "Board"
 msgstr "Bord"
 
-#: src/components/NewWorkspaceForm.tsx:346
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:81
-msgid "Board analytics"
-msgstr "Bordanalyses"
-
 #: src/views/boards/components/NewBoardForm.tsx:21
 msgid "Board name cannot exceed 100 characters"
 msgstr "Bordnaam mag niet langer zijn dan 100 tekens"
@@ -315,12 +281,12 @@ msgid "Board visibility updated"
 msgstr "Zichtbaarheid van bord bijgewerkt"
 
 #: src/components/SideNavigation.tsx:68
-#: src/views/boards/index.tsx:32
+#: src/views/boards/index.tsx:27
 msgid "Boards"
 msgstr "Borden"
 
 #. placeholder {0}: workspace.name ?? "Workspace"
-#: src/views/boards/index.tsx:28
+#: src/views/boards/index.tsx:23
 msgid "Boards | {0}"
 msgstr "Borden | {0}"
 
@@ -342,11 +308,10 @@ msgstr "Bugrapport"
 #: src/views/card/components/DeleteChecklistConfirmation.tsx:63
 #: src/views/card/components/DeleteCommentConfirmation.tsx:76
 #: src/views/members/components/DeleteMemberConfirmation.tsx:55
-#: src/views/settings/components/Avatar.tsx:309
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:168
+#: src/views/settings/components/CustomURLConfirmation.tsx:50
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:88
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:98
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:104
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -358,16 +323,16 @@ msgstr "Kaart niet gevonden"
 msgid "Card title"
 msgstr "Kaarttitel"
 
-#: src/views/settings/AccountSettings.tsx:70
-#: src/views/settings/AccountSettings.tsx:80
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:109
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:178
+#: src/views/settings/index.tsx:291
+#: src/views/settings/index.tsx:301
 msgid "Change Password"
 msgstr "Wachtwoord wijzigen"
 
-#: src/views/settings/AccountSettings.tsx:45
-msgid "Change your language preferences."
-msgstr "Wijzig je taalvoorkeuren."
+#: src/views/settings/index.tsx:190
+msgid "Change the language of the app."
+msgstr "Wijzig de taal van de app."
 
 #: src/views/auth/login/index.tsx:41
 #: src/views/auth/signup/index.tsx:67
@@ -387,10 +352,6 @@ msgstr "Filters wissen"
 msgid "Click on the link we've sent to {magicLinkRecipient} to sign in."
 msgstr "Klik op de link die we naar {magicLinkRecipient} hebben gestuurd om in te loggen."
 
-#: src/views/settings/components/NewApiKeyModal.tsx:136
-msgid "Close"
-msgstr "Sluiten"
-
 #: src/views/boards/components/TemplateBoards.tsx:22
 msgid "Code Review"
 msgstr "Code review"
@@ -399,9 +360,7 @@ msgstr "Code review"
 msgid "Collaborate seamlessly with your team."
 msgstr "Werk naadloos samen met je team."
 
-#: src/components/NewWorkspaceForm.tsx:349
 #: src/views/home/components/Features.tsx:66
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:84
 msgid "Coming soon"
 msgstr "Binnenkort beschikbaar"
 
@@ -430,12 +389,16 @@ msgstr "heeft een checklistitem voltooid"
 msgid "completed checklist item <0>{0}</0>"
 msgstr "heeft checklistitem <0>{0}</0> voltooid"
 
+#: src/views/settings/components/CustomURLConfirmation.tsx:42
+msgid "Confirm URL change"
+msgstr "URL-wijziging bevestigen"
+
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:150
 msgid "Confirm your new password"
 msgstr "Bevestig je nieuwe wachtwoord"
 
 #: src/views/boards/components/ImportBoardsForm.tsx:157
-#: src/views/settings/IntegrationsSettings.tsx:93
+#: src/views/settings/index.tsx:235
 msgid "Connect Trello"
 msgstr "Verbind Trello"
 
@@ -443,7 +406,7 @@ msgstr "Verbind Trello"
 msgid "Connect your favorite tools to streamline your workflow."
 msgstr "Verbind je favoriete tools om je werkstroom te stroomlijnen."
 
-#: src/views/settings/IntegrationsSettings.tsx:80
+#: src/views/settings/index.tsx:222
 msgid "Connect your Trello account to import boards."
 msgstr "Verbind je Trello-account om borden te importeren."
 
@@ -478,10 +441,6 @@ msgstr "Bepaal wie je borden kan bekijken en bewerken."
 msgid "Create another"
 msgstr "Maak nog een"
 
-#: src/views/settings/components/NewApiKeyModal.tsx:175
-msgid "Create API key"
-msgstr "API-sleutel aanmaken"
-
 #: src/views/boards/components/NewBoardForm.tsx:128
 msgid "Create board"
 msgstr "Maak bord"
@@ -506,12 +465,12 @@ msgstr "Lijst maken"
 msgid "Create new board"
 msgstr "Nieuw bord maken"
 
-#: src/views/settings/ApiSettings.tsx:30
+#: src/views/settings/components/CreateAPIKeyForm.tsx:54
 msgid "Create new key"
 msgstr "Nieuwe sleutel aanmaken"
 
 #: src/views/board/components/NewCardForm.tsx:394
-#: src/views/card/components/LabelSelector.tsx:97
+#: src/views/card/components/LabelSelector.tsx:98
 msgid "Create new label"
 msgstr "Maak nieuw label"
 
@@ -519,7 +478,7 @@ msgstr "Maak nieuw label"
 msgid "Create new list"
 msgstr "Maak nieuwe lijst"
 
-#: src/components/NewWorkspaceForm.tsx:384
+#: src/components/NewWorkspaceForm.tsx:94
 #: src/components/WorkspaceMenu.tsx:116
 msgid "Create workspace"
 msgstr "Werkruimte maken"
@@ -532,10 +491,6 @@ msgstr "heeft de kaart aangemaakt"
 msgid "Critical"
 msgstr "Kritiek"
 
-#: src/views/settings/components/Avatar.tsx:275
-msgid "Crop your avatar"
-msgstr "Snijd je avatar bij"
-
 #: src/views/settings/components/ChangePasswordConfirmation.tsx:19
 msgid "Current password is required"
 msgstr "Huidig wachtwoord is vereist"
@@ -544,14 +499,9 @@ msgstr "Huidig wachtwoord is vereist"
 msgid "Custom domain"
 msgstr "Aangepast domein"
 
-#: src/components/NewWorkspaceForm.tsx:315
-msgid "Custom URLs require upgrading to a Pro plan"
-msgstr "Aangepaste URL's vereisen een upgrade naar een Pro-abonnement"
-
-#: src/components/NewWorkspaceForm.tsx:339
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:74
-msgid "Custom workspace URL"
-msgstr "Aangepaste werkruimte-URL"
+#: src/views/settings/components/CustomURLConfirmation.tsx:45
+msgid "Custom URLs are a premium feature. You'll be directed to upgrade your account."
+msgstr "Aangepaste URL's zijn een premium functie. Je wordt doorgestuurd om je account te upgraden."
 
 #: src/views/boards/components/TemplateBoards.tsx:41
 msgid "Customer Support"
@@ -569,9 +519,9 @@ msgstr "Donker"
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/views/settings/AccountSettings.tsx:52
-#: src/views/settings/AccountSettings.tsx:62
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:96
+#: src/views/settings/index.tsx:309
+#: src/views/settings/index.tsx:319
 msgid "Delete account"
 msgstr "Account verwijderen"
 
@@ -592,8 +542,8 @@ msgid "Delete list"
 msgstr "Lijst verwijderen"
 
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:106
-#: src/views/settings/WorkspaceSettings.tsx:96
-#: src/views/settings/WorkspaceSettings.tsx:107
+#: src/views/settings/index.tsx:272
+#: src/views/settings/index.tsx:283
 msgid "Delete workspace"
 msgstr "Werkruimte verwijderen"
 
@@ -619,7 +569,7 @@ msgstr "heeft checklistitem <0>{0}</0> verwijderd"
 msgid "Design"
 msgstr "Ontwerp"
 
-#: src/views/settings/IntegrationsSettings.tsx:108
+#: src/views/settings/index.tsx:250
 msgid "Disconnect Trello"
 msgstr "Trello ontkoppelen"
 
@@ -627,7 +577,7 @@ msgstr "Trello ontkoppelen"
 msgid "Discuss and collaborate on cards."
 msgstr "Bespreek en werk samen aan kaarten."
 
-#: src/views/settings/AccountSettings.tsx:35
+#: src/views/settings/index.tsx:151
 msgid "Display name"
 msgstr "Weergavenaam"
 
@@ -697,7 +647,7 @@ msgstr "Bewerken"
 msgid "email"
 msgstr "e-mail"
 
-#: src/views/members/components/InviteMemberForm.tsx:161
+#: src/views/members/components/InviteMemberForm.tsx:163
 msgid "Email"
 msgstr "E-mail"
 
@@ -745,12 +695,12 @@ msgstr "Fout bij het verwijderen van label"
 msgid "Error deleting workspace"
 msgstr "Fout bij verwijderen werkruimte"
 
-#: src/views/settings/IntegrationsSettings.tsx:60
+#: src/views/settings/index.tsx:101
 msgid "Error disconnecting Trello"
 msgstr "Fout bij ontkoppelen van Trello"
 
-#: src/views/members/components/InviteMemberForm.tsx:71
-#: src/views/members/components/InviteMemberForm.tsx:77
+#: src/views/members/components/InviteMemberForm.tsx:76
+#: src/views/members/components/InviteMemberForm.tsx:82
 msgid "Error inviting member"
 msgstr "Fout bij het uitnodigen van lid"
 
@@ -758,7 +708,7 @@ msgstr "Fout bij het uitnodigen van lid"
 msgid "Error updating display name"
 msgstr "Fout bij bijwerken weergavenaam"
 
-#: src/views/settings/components/Avatar.tsx:80
+#: src/views/settings/components/Avatar.tsx:39
 msgid "Error updating profile image"
 msgstr "Fout bij het bijwerken van profielafbeelding"
 
@@ -774,17 +724,12 @@ msgstr "Fout bij bijwerken naam werkruimte"
 msgid "Error updating workspace URL"
 msgstr "Fout bij het bijwerken van werkruimte-URL"
 
-#: src/views/members/components/InviteMemberForm.tsx:130
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:41
+#: src/views/members/components/InviteMemberForm.tsx:132
 msgid "Error upgrading subscription"
 msgstr "Fout bij het upgraden van abonnement"
 
-#: src/components/NewWorkspaceForm.tsx:142
-msgid "Error upgrading to Pro"
-msgstr "Fout bij upgraden naar Pro"
-
-#: src/views/settings/components/Avatar.tsx:94
-#: src/views/settings/components/Avatar.tsx:221
+#: src/views/settings/components/Avatar.tsx:56
+#: src/views/settings/components/Avatar.tsx:97
 msgid "Error uploading profile image"
 msgstr "Fout bij het uploaden van profielafbeelding"
 
@@ -849,8 +794,8 @@ msgstr "Voor duurzaamheid op lange termijn erkennen we dat alle goede open sourc
 msgid "Free"
 msgstr "Gratis"
 
-#: src/views/members/components/InviteMemberForm.tsx:193
-#: src/views/members/index.tsx:208
+#: src/views/members/components/InviteMemberForm.tsx:192
+#: src/views/members/index.tsx:184
 msgid "Free Plan"
 msgstr "Gratis plan"
 
@@ -959,7 +904,7 @@ msgstr "Ideeën"
 msgid "Ideas to improve this page..."
 msgstr "Ideeën om deze pagina te verbeteren..."
 
-#: src/views/boards/index.tsx:43
+#: src/views/boards/index.tsx:38
 msgid "Import"
 msgstr "Importeren"
 
@@ -997,7 +942,6 @@ msgstr "In behandeling"
 msgid "Individuals"
 msgstr "Individuen"
 
-#: src/components/SettingsLayout.tsx:57
 #: src/views/home/components/Features.tsx:114
 msgid "Integrations"
 msgstr "Integraties"
@@ -1006,24 +950,24 @@ msgstr "Integraties"
 msgid "Interviewing"
 msgstr "Interviewen"
 
-#: src/views/members/components/InviteMemberForm.tsx:40
+#: src/views/members/components/InviteMemberForm.tsx:45
 msgid "Invalid email address"
 msgstr "Ongeldig e-mailadres"
 
-#: src/views/members/index.tsx:221
+#: src/views/members/index.tsx:193
 msgid "Invite"
 msgstr "Uitnodigen"
 
-#: src/views/members/components/InviteMemberForm.tsx:208
+#: src/views/members/components/InviteMemberForm.tsx:207
 msgid "Invite another"
 msgstr "Nog iemand uitnodigen"
 
-#: src/views/card/components/MemberSelector.tsx:111
-#: src/views/members/components/InviteMemberForm.tsx:233
+#: src/views/card/components/MemberSelector.tsx:112
+#: src/views/members/components/InviteMemberForm.tsx:231
 msgid "Invite member"
 msgstr "Lid uitnodigen"
 
-#: src/views/members/components/InviteMemberForm.tsx:196
+#: src/views/members/components/InviteMemberForm.tsx:195
 msgid "Inviting members requires a Team Plan. You'll be redirected to upgrade your workspace."
 msgstr "Voor het uitnodigen van leden is een teamplan vereist. Je wordt doorgestuurd om je werkruimte te upgraden."
 
@@ -1054,23 +998,10 @@ msgstr "Labels"
 msgid "Labels & Filters"
 msgstr "Labels & filters"
 
-#: src/views/settings/AccountSettings.tsx:42
+#: src/views/settings/index.tsx:187
 msgid "Language"
 msgstr "Taal"
 
-#: src/components/NewWorkspaceForm.tsx:332
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:67
-msgid "Launch offer"
-msgstr "Introductieaanbieding"
-
-#: src/views/members/index.tsx:191
-msgid "Launch offer: Get unlimited members with Pro"
-msgstr "Lanceringsaanbieding: krijg onbeperkt aantal leden met Pro"
-
-#: src/views/home/components/Pricing.tsx:99
-msgid "Launch offer: unlimited seats for just $29/month with Pro"
-msgstr "Introductieaanbieding: onbeperkt aantal gebruikers voor slechts $29/maand met Pro"
-
 #: src/views/boards/components/TemplateBoards.tsx:83
 msgid "Learning"
 msgstr "Leren"
@@ -1136,12 +1067,12 @@ msgstr "Gemiddelde prioriteit"
 #: src/views/board/components/Filters.tsx:93
 #: src/views/board/components/NewCardForm.tsx:357
 #: src/views/card/index.tsx:125
-#: src/views/members/index.tsx:178
+#: src/views/members/index.tsx:171
 msgid "Members"
 msgstr "Leden"
 
 #. placeholder {0}: workspace.name ?? "Workspace"
-#: src/views/members/index.tsx:173
+#: src/views/members/index.tsx:167
 msgid "Members | {0}"
 msgstr "Leden | {0}"
 
@@ -1149,7 +1080,7 @@ msgstr "Leden | {0}"
 msgid "Monthly"
 msgstr "Maandelijks"
 
-#: src/views/members/components/InviteMemberForm.tsx:93
+#: src/views/members/components/InviteMemberForm.tsx:92
 msgid "monthly billing"
 msgstr "maandelijkse facturering"
 
@@ -1172,14 +1103,10 @@ msgstr "Naam"
 msgid "Need help?"
 msgstr "Hulp nodig?"
 
-#: src/views/boards/index.tsx:53
+#: src/views/boards/index.tsx:48
 msgid "New"
 msgstr "Nieuw"
 
-#: src/views/settings/components/NewApiKeyModal.tsx:147
-msgid "New API key"
-msgstr "Nieuwe API-sleutel"
-
 #: src/views/boards/components/NewBoardForm.tsx:85
 msgid "New board"
 msgstr "Nieuw bord"
@@ -1217,7 +1144,7 @@ msgstr "Nieuw wachtwoord moet verschillen van het huidige wachtwoord"
 msgid "New Ticket"
 msgstr "Nieuw ticket"
 
-#: src/components/NewWorkspaceForm.tsx:240
+#: src/components/NewWorkspaceForm.tsx:65
 msgid "New workspace"
 msgstr "Nieuwe werkruimte"
 
@@ -1253,11 +1180,11 @@ msgstr "Aanbod"
 msgid "Onboarding"
 msgstr "Inwerktraject"
 
-#: src/views/settings/AccountSettings.tsx:55
+#: src/views/settings/index.tsx:312
 msgid "Once you delete your account, there is no going back. This action cannot be undone."
 msgstr "Zodra je je account verwijdert, is er geen weg terug. Deze actie kan niet ongedaan worden gemaakt."
 
-#: src/views/settings/WorkspaceSettings.tsx:99
+#: src/views/settings/index.tsx:275
 msgid "Once you delete your workspace, there is no going back. This action cannot be undone."
 msgstr "Zodra je je werkruimte verwijdert, is er geen weg terug. Deze actie kan niet ongedaan worden gemaakt."
 
@@ -1289,15 +1216,11 @@ msgstr "Wachtwoord moet minimaal 8 tekens bevatten"
 msgid "Passwords do not match"
 msgstr "Wachtwoorden komen niet overeen"
 
-#: src/views/members/index.tsx:134
-msgid "Paused"
-msgstr "Gepauzeerd"
-
-#: src/views/home/components/Pricing.tsx:102
+#: src/views/home/components/Pricing.tsx:96
 msgid "Payment frequency"
 msgstr "Betalingsfrequentie"
 
-#: src/views/members/index.tsx:134
+#: src/views/members/index.tsx:128
 msgid "Pending"
 msgstr "In behandeling"
 
@@ -1330,13 +1253,13 @@ msgstr "Voer een geldige naam in"
 msgid "Please enter a valid password"
 msgstr "Voer een geldig wachtwoord in"
 
-#: src/views/settings/components/Avatar.tsx:95
+#: src/views/settings/components/Avatar.tsx:57
 msgid "Please select a file to upload."
 msgstr "Selecteer een bestand om te uploaden."
 
 #: src/components/DeleteLabelConfirmation.tsx:26
 #: src/components/FeedbackModal.tsx:41
-#: src/components/NewWorkspaceForm.tsx:155
+#: src/components/NewWorkspaceForm.tsx:42
 #: src/views/board/components/NewCardForm.tsx:174
 #: src/views/board/components/NewListForm.tsx:78
 #: src/views/board/components/UpdateBoardSlugForm.tsx:72
@@ -1351,25 +1274,24 @@ msgstr "Selecteer een bestand om te uploaden."
 #: src/views/card/components/DeleteCardConfirmation.tsx:52
 #: src/views/card/components/DeleteChecklistConfirmation.tsx:37
 #: src/views/card/components/DeleteCommentConfirmation.tsx:45
-#: src/views/card/components/LabelSelector.tsx:72
-#: src/views/card/components/ListSelector.tsx:52
-#: src/views/card/components/MemberSelector.tsx:79
+#: src/views/card/components/LabelSelector.tsx:73
+#: src/views/card/components/ListSelector.tsx:53
+#: src/views/card/components/MemberSelector.tsx:80
 #: src/views/card/components/NewChecklistForm.tsx:70
 #: src/views/card/components/NewChecklistItemForm.tsx:89
 #: src/views/card/components/NewCommentForm.tsx:31
 #: src/views/card/index.tsx:173
 #: src/views/members/components/DeleteMemberConfirmation.tsx:28
-#: src/views/members/components/InviteMemberForm.tsx:78
-#: src/views/members/components/InviteMemberForm.tsx:131
-#: src/views/settings/components/Avatar.tsx:81
-#: src/views/settings/components/Avatar.tsx:222
+#: src/views/members/components/InviteMemberForm.tsx:83
+#: src/views/members/components/InviteMemberForm.tsx:133
+#: src/views/settings/components/Avatar.tsx:40
+#: src/views/settings/components/Avatar.tsx:98
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:40
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:46
 #: src/views/settings/components/UpdateDisplayNameForm.tsx:55
 #: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:62
 #: src/views/settings/components/UpdateWorkspaceNameForm.tsx:57
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:74
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:42
 msgid "Please try again later, or contact customer support."
 msgstr "Probeer het later opnieuw of neem contact op met de klantenservice."
 
@@ -1380,7 +1302,6 @@ msgid "Pricing"
 msgstr "Prijzen"
 
 #: src/views/home/components/Pricing.tsx:56
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:91
 msgid "Priority email support"
 msgstr "Prioriteit e-mailondersteuning"
 
@@ -1392,19 +1313,11 @@ msgstr "Privacybeleid"
 msgid "Private"
 msgstr "Privé"
 
-#: src/views/members/index.tsx:205
-msgid "Pro Plan"
-msgstr "Pro Plan"
-
-#: src/views/members/components/InviteMemberForm.tsx:182
-msgid "Pro Plan ∞"
-msgstr "Pro Plan ∞"
-
-#: src/views/settings/components/Avatar.tsx:67
+#: src/views/settings/components/Avatar.tsx:26
 msgid "Profile image updated"
 msgstr "Profielafbeelding bijgewerkt"
 
-#: src/views/settings/AccountSettings.tsx:29
+#: src/views/settings/index.tsx:146
 msgid "Profile picture"
 msgstr "Profielfoto"
 
@@ -1440,7 +1353,7 @@ msgstr "Op afstand"
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: src/views/members/index.tsx:148
+#: src/views/members/index.tsx:142
 msgid "Remove member"
 msgstr "Lid verwijderen"
 
@@ -1487,12 +1400,16 @@ msgstr "Bronnen"
 msgid "Review"
 msgstr "Beoordeling"
 
+#: src/views/settings/components/CreateAPIKeyForm.tsx:49
+msgid "Revoke"
+msgstr "Intrekken"
+
 #: src/views/home/components/Footer.tsx:36
 #: src/views/home/components/Header.tsx:13
 msgid "Roadmap"
 msgstr "Roadmap"
 
-#: src/views/members/index.tsx:243
+#: src/views/members/index.tsx:215
 msgid "Role"
 msgstr "Rol"
 
@@ -1501,7 +1418,6 @@ msgid "Run on your own infrastructure"
 msgstr "Draai op je eigen infrastructuur"
 
 #: src/views/card/components/Comment.tsx:165
-#: src/views/settings/components/Avatar.tsx:312
 msgid "Save"
 msgstr "Opslaan"
 
@@ -1541,30 +1457,15 @@ msgstr "Feedback versturen"
 msgid "Senior"
 msgstr "Senior"
 
-#: src/components/SettingsLayout.tsx:82
 #: src/components/SideNavigation.tsx:78
+#: src/views/settings/index.tsx:140
 msgid "Settings"
 msgstr "Instellingen"
 
-#: src/views/settings/AccountSettings.tsx:25
-msgid "Settings | Account"
-msgstr "Instellingen | Account"
-
-#: src/views/settings/ApiSettings.tsx:18
-msgid "Settings | API"
-msgstr "Instellingen | API"
-
-#: src/views/settings/BillingSettings.tsx:35
-msgid "Settings | Billing"
-msgstr "Instellingen | Facturering"
-
-#: src/views/settings/IntegrationsSettings.tsx:69
-msgid "Settings | Integrations"
-msgstr "Instellingen | Integraties"
-
-#: src/views/settings/WorkspaceSettings.tsx:54
-msgid "Settings | Workspace"
-msgstr "Instellingen | Werkruimte"
+#. placeholder {0}: workspace.name ?? "Workspace"
+#: src/views/settings/index.tsx:136
+msgid "Settings | {0}"
+msgstr "Instellingen | {0}"
 
 #: src/views/home/components/Header.tsx:100
 #: src/views/home/components/Header.tsx:138
@@ -1613,10 +1514,6 @@ msgstr "Star op Github"
 msgid "Success"
 msgstr "Geslaagd"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:55
-msgid "Supercharge your workspace for just $29/month. Here's what you'll get:"
-msgstr "Geef je werkruimte een boost voor slechts $29/maand. Dit krijg je:"
-
 #: src/components/UserMenu.tsx:180
 msgid "Support"
 msgstr "Ondersteuning"
@@ -1629,8 +1526,8 @@ msgstr "Ondersteun de ontwikkeling van het project"
 msgid "System"
 msgstr "Systeem"
 
-#: src/views/members/components/InviteMemberForm.tsx:182
-#: src/views/members/index.tsx:207
+#: src/views/members/components/InviteMemberForm.tsx:183
+#: src/views/members/index.tsx:184
 msgid "Team Plan"
 msgstr "Teamplan"
 
@@ -1682,10 +1579,6 @@ msgstr "Ze zullen geen toegang meer hebben tot deze werkruimte."
 msgid "This action can't be undone."
 msgstr "Deze actie kan niet ongedaan worden gemaakt."
 
-#: src/views/settings/components/NewApiKeyModal.tsx:129
-msgid "This API key will only be shown once. Please save it in a secure location."
-msgstr "Deze API-sleutel wordt slechts één keer getoond. Bewaar deze op een veilige plaats."
-
 #: src/views/public/board/index.tsx:151
 msgid "This board is private or does not exist"
 msgstr "Dit bord is privé of bestaat niet"
@@ -1702,14 +1595,6 @@ msgstr "Dit zal resulteren in het permanent verwijderen van alle gegevens die aa
 msgid "This will result in the permanent deletion of all data associated with your account."
 msgstr "Dit zal resulteren in het permanent verwijderen van alle gegevens die aan je account zijn gekoppeld."
 
-#: src/components/NewWorkspaceForm.tsx:284
-msgid "This workspace URL has already been taken"
-msgstr "Deze werkruimte-URL is al in gebruik"
-
-#: src/components/NewWorkspaceForm.tsx:286
-msgid "This workspace URL is reserved"
-msgstr "Deze werkruimte-URL is gereserveerd"
-
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:123
 msgid "This workspace username has already been taken"
 msgstr "Deze werkruimtegebruikersnaam is al in gebruik"
@@ -1727,11 +1612,7 @@ msgstr "Menu in-/uitschakelen"
 msgid "Track all card changes with detailed activity history."
 msgstr "Volg alle kaartwijzigingen met gedetailleerde activiteitengeschiedenis."
 
-#: src/views/settings/IntegrationsSettings.tsx:73
-msgid "Trello"
-msgstr "Trello"
-
-#: src/views/settings/IntegrationsSettings.tsx:53
+#: src/views/settings/index.tsx:94
 msgid "Trello disconnected"
 msgstr "Trello ontkoppeld"
 
@@ -1763,7 +1644,7 @@ msgstr "Kan checklist niet maken"
 msgid "Unable to create list"
 msgstr "Kan geen lijst maken"
 
-#: src/components/NewWorkspaceForm.tsx:154
+#: src/components/NewWorkspaceForm.tsx:41
 msgid "Unable to create workspace"
 msgstr "Kan werkruimte niet aanmaken"
 
@@ -1816,16 +1697,16 @@ msgstr "Kan checklistitem niet bijwerken"
 msgid "Unable to update comment"
 msgstr "Kan reactie niet bijwerken"
 
-#: src/views/card/components/LabelSelector.tsx:71
+#: src/views/card/components/LabelSelector.tsx:72
 msgid "Unable to update labels"
 msgstr "Kan labels niet bijwerken"
 
 #: src/views/board/index.tsx:133
-#: src/views/card/components/ListSelector.tsx:51
+#: src/views/card/components/ListSelector.tsx:52
 msgid "Unable to update list"
 msgstr "Kan lijst niet bijwerken"
 
-#: src/views/card/components/MemberSelector.tsx:78
+#: src/views/card/components/MemberSelector.tsx:79
 msgid "Unable to update members"
 msgstr "Kan leden niet bijwerken"
 
@@ -1862,15 +1743,10 @@ msgstr "Onbeperkt aantal opmerkingen"
 msgid "Unlimited lists"
 msgstr "Onbeperkt aantal lijsten"
 
-#: src/components/NewWorkspaceForm.tsx:329
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:64
-msgid "Unlimited members"
-msgstr "Onbeperkt aantal leden"
-
 #: src/views/board/components/UpdateBoardSlugForm.tsx:174
-#: src/views/settings/components/UpdateDisplayNameForm.tsx:80
-#: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:91
-#: src/views/settings/components/UpdateWorkspaceNameForm.tsx:83
+#: src/views/settings/components/UpdateDisplayNameForm.tsx:79
+#: src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx:90
+#: src/views/settings/components/UpdateWorkspaceNameForm.tsx:82
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:154
 msgid "Update"
 msgstr "Bijwerken"
@@ -1896,20 +1772,11 @@ msgstr "titel bijgewerkt"
 msgid "updated the title to <0>{0}</0>"
 msgstr "titel bijgewerkt naar <0>{0}</0>"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:109
+#: src/views/settings/components/CustomURLConfirmation.tsx:52
 msgid "Upgrade"
 msgstr "Upgraden"
 
-#: src/views/settings/components/UpgradeToProConfirmation.tsx:52
-#: src/views/settings/WorkspaceSettings.tsx:89
-msgid "Upgrade to Pro"
-msgstr "Upgraden naar Pro"
-
-#: src/components/NewWorkspaceForm.tsx:369
-msgid "Upgrade to Pro ($29/month)"
-msgstr "Upgrade naar Pro ($29/maand)"
-
-#: src/views/members/components/InviteMemberForm.tsx:224
+#: src/views/members/components/InviteMemberForm.tsx:222
 msgid "Upgrade to Team Plan"
 msgstr "Upgraden naar teamplan"
 
@@ -1918,17 +1785,14 @@ msgstr "Upgraden naar teamplan"
 msgid "Urgent"
 msgstr "Urgent"
 
-#: src/components/NewWorkspaceForm.tsx:35
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:36
 msgid "URL can only contain letters, numbers, and hyphens"
 msgstr "URL kan alleen letters, cijfers en koppeltekens bevatten"
 
-#: src/components/NewWorkspaceForm.tsx:33
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:34
 msgid "URL cannot exceed 24 characters"
 msgstr "URL mag niet langer zijn dan 24 tekens"
 
-#: src/components/NewWorkspaceForm.tsx:31
 #: src/views/settings/components/UpdateWorkspaceUrlForm.tsx:32
 msgid "URL must be at least 3 characters long"
 msgstr "URL moet minimaal 3 tekens lang zijn"
@@ -1937,11 +1801,11 @@ msgstr "URL moet minimaal 3 tekens lang zijn"
 msgid "Use template"
 msgstr "Sjabloon gebruiken"
 
-#: src/views/members/index.tsx:237
+#: src/views/members/index.tsx:209
 msgid "User"
 msgstr "Gebruiker"
 
-#: src/views/members/components/InviteMemberForm.tsx:72
+#: src/views/members/components/InviteMemberForm.tsx:77
 msgid "User is already a member of this workspace"
 msgstr "Gebruiker is al lid van deze werkruimte"
 
@@ -1949,11 +1813,11 @@ msgstr "Gebruiker is al lid van deze werkruimte"
 msgid "Video"
 msgstr "Video"
 
-#: src/views/settings/ApiSettings.tsx:25
+#: src/views/settings/index.tsx:262
 msgid "View and manage your API keys."
 msgstr "Bekijk en beheer je API-sleutels."
 
-#: src/views/settings/BillingSettings.tsx:42
+#: src/views/settings/index.tsx:201
 msgid "View and manage your billing and subscription."
 msgstr "Bekijk en beheer je facturering en abonnement."
 
@@ -2005,20 +1869,15 @@ msgstr "Toen Trello in 2011 werd gelanceerd, blies het iedereen omver met zijn z
 msgid "Why make an open source Trello?"
 msgstr "Waarom een open source Trello maken?"
 
-#: src/components/SettingsLayout.tsx:39
 #: src/views/board/index.tsx:331
 msgid "Workspace"
 msgstr "Werkruimte"
 
-#: src/components/NewWorkspaceForm.tsx:143
-msgid "Workspace created successfully. You can upgrade later in settings."
-msgstr "Werkruimte succesvol aangemaakt. Je kunt later upgraden in de instellingen."
-
 #: src/views/settings/components/DeleteWorkspaceConfirmation.tsx:26
 msgid "Workspace deleted"
 msgstr "Werkruimte verwijderd"
 
-#: src/views/settings/WorkspaceSettings.tsx:75
+#: src/views/settings/index.tsx:177
 msgid "Workspace description"
 msgstr "Werkruimte beschrijving"
 
@@ -2039,8 +1898,8 @@ msgstr "Werkruimtebeschrijving bijgewerkt"
 msgid "Workspace members"
 msgstr "Werkruimteleden"
 
-#: src/components/NewWorkspaceForm.tsx:259
-#: src/views/settings/WorkspaceSettings.tsx:58
+#: src/components/NewWorkspaceForm.tsx:81
+#: src/views/settings/index.tsx:158
 msgid "Workspace name"
 msgstr "Naam werkruimte"
 
@@ -2048,10 +1907,6 @@ msgstr "Naam werkruimte"
 msgid "Workspace name cannot exceed 24 characters"
 msgstr "Werkruimtenaam mag niet langer zijn dan 24 tekens"
 
-#: src/components/NewWorkspaceForm.tsx:27
-msgid "Workspace name is required"
-msgstr "Naam van werkruimte is verplicht"
-
 #: src/views/settings/components/UpdateWorkspaceNameForm.tsx:14
 msgid "Workspace name must be at least 3 characters long"
 msgstr "Werkruimtenaam moet minimaal 3 tekens lang zijn"
@@ -2064,14 +1919,10 @@ msgstr "Werkruimtenaam bijgewerkt"
 msgid "Workspace slug updated"
 msgstr "Werkruimte-slug bijgewerkt"
 
-#: src/views/settings/WorkspaceSettings.tsx:66
+#: src/views/settings/index.tsx:167
 msgid "Workspace URL"
 msgstr "Werkruimte URL"
 
-#: src/components/NewWorkspaceForm.tsx:273
-msgid "workspace-url"
-msgstr "werkruimte-url"
-
 #: src/views/boards/components/TemplateBoards.tsx:30
 msgid "Writing"
 msgstr "Schrijven"
@@ -2084,7 +1935,7 @@ msgstr "Jaarlijks"
 msgid "Yes, we offer an forever free plan for individual use. No restrictions, no paywalls, no limits."
 msgstr "Ja, we bieden een voor altijd gratis plan voor individueel gebruik. Geen beperkingen, geen betaalmuren, geen limieten."
 
-#: src/views/settings/AccountSettings.tsx:73
+#: src/views/settings/index.tsx:294
 msgid "You are about to change your password."
 msgstr "Je staat op het punt je wachtwoord te wijzigen."
 
@@ -2108,10 +1959,6 @@ msgstr "Je bent succesvol ingelogd."
 msgid "You have been signed up successfully."
 msgstr "Je bent succesvol geregistreerd."
 
-#: src/views/members/components/InviteMemberForm.tsx:186
-msgid "You have unlimited seats with your Pro Plan. There is no additional charge for new members!"
-msgstr "Je hebt onbeperkte plaatsen met je Pro Plan. Er zijn geen extra kosten voor nieuwe leden!"
-
 #: src/views/settings/components/DeleteAccountConfirmation.tsx:28
 msgid "Your account has been deleted."
 msgstr "Je account is verwijderd."
@@ -2128,15 +1975,15 @@ msgstr "Je weergavenaam is bijgewerkt."
 msgid "Your password has been changed."
 msgstr "Je wachtwoord is gewijzigd."
 
-#: src/views/settings/components/Avatar.tsx:68
+#: src/views/settings/components/Avatar.tsx:27
 msgid "Your profile image has been updated."
 msgstr "Je profielafbeelding is bijgewerkt."
 
-#: src/views/settings/IntegrationsSettings.tsx:54
+#: src/views/settings/index.tsx:95
 msgid "Your Trello account has been disconnected."
 msgstr "Je Trello-account is ontkoppeld."
 
-#: src/views/settings/IntegrationsSettings.tsx:102
+#: src/views/settings/index.tsx:244
 msgid "Your Trello account is connected."
 msgstr "Je Trello-account is verbonden."
 

apps/web/src/pages/_app.tsx

@@ -7,7 +7,6 @@ import type { ReactElement, ReactNode } from "react";
 import { Plus_Jakarta_Sans } from "next/font/google";
 import Script from "next/script";
 import { env } from "next-runtime-env";
-import { ThemeProvider } from "next-themes";
 import posthog from "posthog-js";
 import { PostHogProvider } from "posthog-js/react";
 import { useEffect } from "react";
@@ -15,6 +14,7 @@ import { useEffect } from "react";
 import { LinguiProviderWrapper } from "~/providers/lingui";
 import { ModalProvider } from "~/providers/modal";
 import { PopupProvider } from "~/providers/popup";
+import { ThemeProvider } from "next-themes";
 import { api } from "~/utils/api";
 
 const jakarta = Plus_Jakarta_Sans({
@@ -82,8 +82,8 @@ const MyApp: AppType = ({ Component, pageProps }: AppPropsWithLayout) => {
       <main className="font-sans">
         <LinguiProviderWrapper>
           <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
-            <ModalProvider>
-              <PopupProvider>
+              <ModalProvider>
+                <PopupProvider>
                 {posthogKey ? (
                   <PostHogProvider client={posthog}>
                     {getLayout(<Component {...pageProps} />)}
@@ -91,8 +91,8 @@ const MyApp: AppType = ({ Component, pageProps }: AppPropsWithLayout) => {
                 ) : (
                   getLayout(<Component {...pageProps} />)
                 )}
-              </PopupProvider>
-            </ModalProvider>
+                </PopupProvider>
+              </ModalProvider>
           </ThemeProvider>
         </LinguiProviderWrapper>
       </main>

apps/web/src/pages/api/stripe/create_checkout_session.ts

@@ -3,7 +3,6 @@ import { env } from "next-runtime-env";
 import { z } from "zod";
 
 import { createNextApiContext } from "@kan/api/trpc";
-import * as subscriptionRepo from "@kan/db/repository/subscription.repo";
 import * as workspaceRepo from "@kan/db/repository/workspace.repo";
 import { createStripeClient } from "@kan/stripe";
 
@@ -41,22 +40,17 @@ export default async function handler(
     const body = req.body as CheckoutSessionRequest;
     const { successUrl, cancelUrl, slug, workspacePublicId } = body;
 
-    if (!successUrl || !cancelUrl || !workspacePublicId) {
+    if (!successUrl || !cancelUrl || !slug || !workspacePublicId) {
       return res.status(400).json({ error: "Missing required fields" });
     }
 
-    if (slug) {
-      const slugResult = workspaceSlugSchema.safeParse(slug);
+    const slugResult = workspaceSlugSchema.safeParse(slug);
 
-      if (!slugResult.success) {
-        return new Response(
-          JSON.stringify({ error: "Invalid workspace slug" }),
-          {
-            status: 400,
-            headers: { "Content-Type": "application/json" },
-          },
-        );
-      }
+    if (!slugResult.success) {
+      return new Response(JSON.stringify({ error: "Invalid workspace slug" }), {
+        status: 400,
+        headers: { "Content-Type": "application/json" },
+      });
     }
 
     const workspace = await workspaceRepo.getAllByUserId(db, user.id);
@@ -72,37 +66,20 @@ export default async function handler(
       });
     }
 
-    const subscription = await subscriptionRepo.create(db, {
-      plan: "pro",
-      referenceId: workspacePublicId,
-      userId: user.id,
-      stripeCustomerId: user.stripeCustomerId ?? "",
-      status: "incomplete",
-    });
-
-    const subscriptionId = subscription?.id;
-
-    if (!subscriptionId) {
-      return res.status(500).json({ error: "Error creating subscription" });
-    }
-
     const session = await stripe.checkout.sessions.create({
       mode: "subscription",
       line_items: [
         {
-          price: process.env.STRIPE_PRO_PLAN_MONTHLY_PRICE_ID,
+          price: process.env.STRIPE_PRO_PLAN_PRICE_ID,
           quantity: 1,
         },
       ],
       success_url: `${env("NEXT_PUBLIC_BASE_URL")}${successUrl}`,
       cancel_url: `${env("NEXT_PUBLIC_BASE_URL")}${cancelUrl}`,
-      client_reference_id: workspacePublicId,
       customer: user.stripeCustomerId ?? undefined,
       metadata: {
-        ...(slug && { workspaceSlug: slug }),
+        workspaceSlug: slug,
         workspacePublicId,
-        userId: user.id,
-        subscriptionId,
       },
     });
 

apps/web/src/pages/api/stripe/webhook.ts

@@ -36,7 +36,7 @@ export default async function handler(
     const event = stripe.webhooks.constructEvent(
       rawBody,
       sig,
-      process.env.STRIPE_WEBHOOK_SECRET_LEGACY!,
+      process.env.STRIPE_WEBHOOK_SECRET!,
     );
 
     const { db } = await createNextApiContext(req);
@@ -47,9 +47,9 @@ export default async function handler(
 
         const metaData = checkoutSession.metadata;
 
-        if (metaData?.workspacePublicId) {
+        if (metaData?.workspacePublicId && metaData.workspaceSlug) {
           await workspaceRepo.update(db, metaData.workspacePublicId, {
-            ...(metaData.workspaceSlug && { slug: metaData.workspaceSlug }),
+            slug: metaData.workspaceSlug,
             plan: "pro",
           });
         }

apps/web/src/pages/settings/account.tsx

@@ -1,16 +0,0 @@
-import type { NextPageWithLayout } from "~/pages/_app";
-import { getDashboardLayout } from "~/components/Dashboard";
-import { SettingsLayout } from "~/components/SettingsLayout";
-import AccountSettings from "~/views/settings/AccountSettings";
-
-const AccountSettingsPage: NextPageWithLayout = () => {
-  return (
-    <SettingsLayout currentTab="account">
-      <AccountSettings />
-    </SettingsLayout>
-  );
-};
-
-AccountSettingsPage.getLayout = (page) => getDashboardLayout(page);
-
-export default AccountSettingsPage;

apps/web/src/pages/settings/api.tsx

@@ -1,16 +0,0 @@
-import type { NextPageWithLayout } from "~/pages/_app";
-import { getDashboardLayout } from "~/components/Dashboard";
-import { SettingsLayout } from "~/components/SettingsLayout";
-import ApiSettings from "~/views/settings/ApiSettings";
-
-const ApiSettingsPage: NextPageWithLayout = () => {
-  return (
-    <SettingsLayout currentTab="api">
-      <ApiSettings />
-    </SettingsLayout>
-  );
-};
-
-ApiSettingsPage.getLayout = (page) => getDashboardLayout(page);
-
-export default ApiSettingsPage;

apps/web/src/pages/settings/billing.tsx

@@ -1,16 +0,0 @@
-import type { NextPageWithLayout } from "~/pages/_app";
-import { getDashboardLayout } from "~/components/Dashboard";
-import { SettingsLayout } from "~/components/SettingsLayout";
-import BillingSettings from "~/views/settings/BillingSettings";
-
-const BillingSettingsPage: NextPageWithLayout = () => {
-  return (
-    <SettingsLayout currentTab="billing">
-      <BillingSettings />
-    </SettingsLayout>
-  );
-};
-
-BillingSettingsPage.getLayout = (page) => getDashboardLayout(page);
-
-export default BillingSettingsPage;

apps/web/src/pages/settings/index.tsx

@@ -0,0 +1,17 @@
+import type { NextPageWithLayout } from "~/pages/_app";
+import { getDashboardLayout } from "~/components/Dashboard";
+import Popup from "~/components/Popup";
+import SettingsView from "~/views/settings";
+
+const SettingsPage: NextPageWithLayout = () => {
+  return (
+    <>
+      <SettingsView />
+      <Popup />
+    </>
+  );
+};
+
+SettingsPage.getLayout = (page) => getDashboardLayout(page);
+
+export default SettingsPage;

apps/web/src/pages/settings/integrations.tsx

@@ -1,16 +0,0 @@
-import type { NextPageWithLayout } from "~/pages/_app";
-import { getDashboardLayout } from "~/components/Dashboard";
-import { SettingsLayout } from "~/components/SettingsLayout";
-import IntegrationsSettings from "~/views/settings/IntegrationsSettings";
-
-const IntegrationsSettingsPage: NextPageWithLayout = () => {
-  return (
-    <SettingsLayout currentTab="integrations">
-      <IntegrationsSettings />
-    </SettingsLayout>
-  );
-};
-
-IntegrationsSettingsPage.getLayout = (page) => getDashboardLayout(page);
-
-export default IntegrationsSettingsPage;

apps/web/src/pages/settings/workspace.tsx

@@ -1,16 +0,0 @@
-import type { NextPageWithLayout } from "~/pages/_app";
-import { getDashboardLayout } from "~/components/Dashboard";
-import { SettingsLayout } from "~/components/SettingsLayout";
-import WorkspaceSettings from "~/views/settings/WorkspaceSettings";
-
-const WorkspaceSettingsPage: NextPageWithLayout = () => {
-  return (
-    <SettingsLayout currentTab="workspace">
-      <WorkspaceSettings />
-    </SettingsLayout>
-  );
-};
-
-WorkspaceSettingsPage.getLayout = (page) => getDashboardLayout(page);
-
-export default WorkspaceSettingsPage;

apps/web/src/providers/modal.tsx

@@ -1,4 +1,4 @@
-import { createContext, useCallback, useContext, useState } from "react";
+import { createContext, useContext, useState } from "react";
 
 interface ModalState {
   contentType: string;
@@ -42,59 +42,57 @@ export const ModalProvider: React.FC<Props> = ({ children }) => {
   const entityId = currentModal?.entityId || "";
   const entityLabel = currentModal?.entityLabel || "";
 
-  const openModal = useCallback(
-    (contentType: string, entityId?: string, entityLabel?: string) => {
-      const newModal: ModalState = { contentType, entityId, entityLabel };
-      setModalStack((prev) => [...prev, newModal]);
-    },
-    [],
-  );
+  const openModal = (
+    contentType: string,
+    entityId?: string,
+    entityLabel?: string,
+  ) => {
+    const newModal: ModalState = { contentType, entityId, entityLabel };
+    setModalStack((prev) => [...prev, newModal]);
+  };
 
-  const closeModal = useCallback(() => {
+  const closeModal = () => {
     setModalStack((prev) => {
       if (prev.length <= 1) {
         return [];
       }
       return prev.slice(0, -1);
     });
-  }, []);
+  };
 
-  const closeModals = useCallback((count: number) => {
-    setModalStack((prev) => {
+  const closeModals = (count: number) => {
+    setModalStack(prev => {
       const newLength = Math.max(0, prev.length - count);
       return prev.slice(0, newLength);
     });
-  }, []);
+  };
 
-  const clearAllModals = useCallback(() => {
+  const clearAllModals = () => {
     setModalStack([]);
-  }, []);
+  };
 
-  const setModalState = useCallback((modalType: string, state: any) => {
+  const setModalState = (modalType: string, state: any) => {
     setModalStates((prev) => ({
       ...prev,
       [modalType]: state,
     }));
-  }, []);
+  };
 
-  const getModalState = useCallback(
-    (modalType: string) => {
-      return modalStates[modalType];
-    },
-    [modalStates],
-  );
+  const getModalState = (modalType: string) => {
+    return modalStates[modalType];
+  };
 
-  const clearModalState = useCallback((modalType: string) => {
+  const clearModalState = (modalType: string) => {
     setModalStates((prev) => {
       const newStates = { ...prev };
       delete newStates[modalType];
       return newStates;
     });
-  }, []);
+  };
 
-  const clearAllModalStates = useCallback(() => {
+  const clearAllModalStates = () => {
     setModalStates({});
-  }, []);
+  };
 
   return (
     <ModalContext.Provider

apps/web/src/providers/workspace.tsx

@@ -47,16 +47,12 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
   const [hasLoaded, setHasLoaded] = useState(false);
 
   const { data, isLoading } = api.workspace.all.useQuery();
-  const utils = api.useUtils();
 
   const switchWorkspace = (_workspace: Workspace) => {
     localStorage.setItem("workspacePublicId", _workspace.publicId);
 
     setWorkspace(_workspace);
 
-    // Refetch workspace data to ensure availableWorkspaces is up to date
-    void utils.workspace.all.refetch();
-
     router.push(`/boards`);
   };
 
@@ -70,15 +66,21 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
       localStorage.getItem("workspacePublicId");
 
     if (data.length) {
-      const workspaces = data.map(({ workspace, role }) => ({
-        role,
-        publicId: workspace.publicId,
-        name: workspace.name,
-        slug: workspace.slug,
-        description: workspace.description,
-        plan: workspace.plan,
-        hasLoaded: true,
-      })) as Workspace[];
+      const workspaces = data
+        .map(({ workspace, role }) => {
+          if (!workspace) return;
+
+          return {
+            role,
+            publicId: workspace.publicId,
+            name: workspace.name,
+            slug: workspace.slug,
+            description: workspace.description,
+            plan: workspace.plan,
+            hasLoaded: true,
+          };
+        })
+        .filter((workspace) => workspace !== null) as Workspace[];
 
       if (workspaces.length) setAvailableWorkspaces(workspaces);
     }
@@ -114,7 +116,7 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
         role: primaryWorkspaceRole,
       });
     }
-  }, [data, isLoading]);
+  }, [data]);
 
   return (
     <WorkspaceContext.Provider

apps/web/src/utils/i18n.ts

@@ -18,8 +18,6 @@ const loadMessages = async (locale: Locale) => {
       return (await import("~/locales/it/messages")).messages;
     case "nl":
       return (await import("~/locales/nl/messages")).messages;
-    case "ru":
-      return (await import("~/locales/ru/messages")).messages;
     default:
       return enMessages;
   }

apps/web/src/views/board/components/UpdateBoardSlugForm.tsx

@@ -155,7 +155,7 @@ export function UpdateBoardSlugForm({
         <div className="flex items-center gap-2">
           <Button
             variant="secondary"
-            href="/settings?tab=workspace"
+            href="/settings?edit=workspace_url"
             onClick={closeModal}
           >
             {t`Edit workspace URL`}

apps/web/src/views/boards/components/BoardsList.tsx

@@ -19,7 +19,7 @@ export function BoardsList() {
 
   if (isLoading)
     return (
-      <div className="3xl:grid-cols-4 grid h-fit w-full grid-cols-1 gap-4 sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-3">
+      <div className="grid h-fit w-full grid-cols-1 gap-4 sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-3 2xl:grid-cols-7">
         <div className="mr-5 flex h-[150px] w-full animate-pulse rounded-md bg-light-200 dark:bg-dark-100" />
         <div className="mr-5 flex h-[150px] w-full animate-pulse rounded-md bg-light-200 dark:bg-dark-100" />
         <div className="mr-5 flex h-[150px] w-full animate-pulse rounded-md bg-light-200 dark:bg-dark-100" />
@@ -45,7 +45,7 @@ export function BoardsList() {
     );
 
   return (
-    <div className="3xl:grid-cols-4 grid h-fit w-full grid-cols-1 gap-4 sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-3">
+    <div className="grid h-fit w-full grid-cols-1 gap-4 sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-3 2xl:grid-cols-7">
       {data?.map((board) => (
         <Link key={board.publicId} href={`boards/${board.publicId}`}>
           <div className="align-center relative mr-5 flex h-[150px] w-full items-center justify-center rounded-md border border-dashed border-light-400 bg-light-50 shadow-sm hover:bg-light-200 dark:border-dark-600 dark:bg-dark-50 dark:hover:bg-dark-100">

apps/web/src/views/boards/index.tsx

@@ -1,5 +1,4 @@
 import { t } from "@lingui/core/macro";
-import { useEffect } from "react";
 import { HiArrowDownTray, HiOutlinePlusSmall } from "react-icons/hi2";
 
 import Button from "~/components/Button";
@@ -15,13 +14,9 @@ import { NewBoardForm } from "./components/NewBoardForm";
 
 export default function BoardsPage() {
   const { openModal, modalContentType, isOpen } = useModal();
-  const { availableWorkspaces, workspace, hasLoaded } = useWorkspace();
+  const { workspace, hasLoaded } = useWorkspace();
 
-  useEffect(() => {
-    if (hasLoaded && availableWorkspaces.length === 0) {
-      openModal("NEW_WORKSPACE");
-    }
-  }, [hasLoaded, availableWorkspaces.length, openModal]);
+  if (hasLoaded && !workspace.publicId) openModal("NEW_WORKSPACE");
 
   return (
     <>

apps/web/src/views/card/components/LabelSelector.tsx

@@ -1,3 +1,4 @@
+import { Menu } from "@headlessui/react";
 import { t } from "@lingui/core/macro";
 import { HiMiniPlus } from "react-icons/hi2";
 
@@ -100,19 +101,22 @@ export default function LabelSelector({
           {selectedLabels.length ? (
             <div className="flex flex-wrap gap-x-0.5">
               {selectedLabels.map((label) => (
-                <Badge
-                  key={label.key}
-                  value={label.value}
-                  iconLeft={label.leftIcon}
-                />
+                <Menu.Button key={label.key}>
+                  <Badge value={label.value} iconLeft={label.leftIcon} />
+                </Menu.Button>
               ))}
-              <Badge value={t`Add label`} iconLeft={<HiMiniPlus size={14} />} />
+              <Menu.Button>
+                <Badge
+                  value={t`Add label`}
+                  iconLeft={<HiMiniPlus size={14} />}
+                />
+              </Menu.Button>
             </div>
           ) : (
-            <div className="flex h-full w-full items-center rounded-[5px] border-[1px] border-light-50 pl-2 text-left text-sm text-neutral-900 hover:border-light-300 hover:bg-light-200 dark:border-dark-50 dark:text-dark-1000 dark:hover:border-dark-200 dark:hover:bg-dark-100">
+            <Menu.Button className="flex h-full w-full items-center rounded-[5px] border-[1px] border-light-50 pl-2 text-left text-sm text-neutral-900 hover:border-light-300 hover:bg-light-200 dark:border-dark-50 dark:text-dark-1000 dark:hover:border-dark-200 dark:hover:bg-dark-100">
               <HiMiniPlus size={22} className="pr-2" />
               {t`Add label`}
-            </div>
+            </Menu.Button>
           )}
         </CheckboxDropdown>
       )}

apps/web/src/views/card/components/ListSelector.tsx

@@ -1,3 +1,4 @@
+import { Menu } from "@headlessui/react";
 import { t } from "@lingui/core/macro";
 
 import CheckboxDropdown from "~/components/CheckboxDropdown";
@@ -78,9 +79,9 @@ export default function ListSelector({
           }}
           asChild
         >
-          <div className="flex h-full w-full items-center rounded-[5px] border-[1px] border-light-50 py-1 pl-2 text-left text-sm text-neutral-900 hover:border-light-300 hover:bg-light-200 dark:border-dark-50 dark:text-dark-1000 dark:hover:border-dark-200 dark:hover:bg-dark-100">
+          <Menu.Button className="flex h-full w-full items-center rounded-[5px] border-[1px] border-light-50 py-1 pl-2 text-left text-sm text-neutral-900 hover:border-light-300 hover:bg-light-200 dark:border-dark-50 dark:text-dark-1000 dark:hover:border-dark-200 dark:hover:bg-dark-100">
             {selectedList?.value}
-          </div>
+          </Menu.Button>
         </CheckboxDropdown>
       )}
     </>

apps/web/src/views/card/components/MemberSelector.tsx

@@ -1,4 +1,5 @@
 import { useRouter } from "next/router";
+import { Menu } from "@headlessui/react";
 import { t } from "@lingui/core/macro";
 import { HiMiniPlus } from "react-icons/hi2";
 
@@ -111,12 +112,11 @@ export default function MemberSelector({
           createNewItemLabel={t`Invite member`}
           asChild
         >
-          <div className="flex h-full w-full items-center rounded-[5px] border-[1px] border-light-50 py-1 pl-2 text-left text-sm text-neutral-900 hover:border-light-300 hover:bg-light-200 dark:border-dark-50 dark:text-dark-1000 dark:hover:border-dark-200 dark:hover:bg-dark-100">
+          <Menu.Button className="flex h-full w-full items-center rounded-[5px] border-[1px] border-light-50 py-1 pl-2 text-left text-sm text-neutral-900 hover:border-light-300 hover:bg-light-200 dark:border-dark-50 dark:text-dark-1000 dark:hover:border-dark-200 dark:hover:bg-dark-100">
             {selectedMembers.length ? (
               <div className="isolate flex justify-end -space-x-1 overflow-hidden">
                 {selectedMembers.map(({ value, imageUrl }) => (
                   <Avatar
-                    key={value}
                     size="sm"
                     name={value}
                     imageUrl={imageUrl}
@@ -130,7 +130,7 @@ export default function MemberSelector({
                 {t`Add member`}
               </>
             )}
-          </div>
+          </Menu.Button>
         </CheckboxDropdown>
       )}
     </>

apps/web/src/views/home/components/Layout.tsx

@@ -1,10 +1,8 @@
-import { useTheme } from "next-themes";
-
-import { authClient } from "@kan/auth/client";
-
 import PatternedBackground from "~/components/PatternedBackground";
+import { useTheme } from "next-themes";
 import Footer from "./Footer";
 import Header from "./Header";
+import { authClient } from "@kan/auth/client";
 
 export default function Layout({ children }: { children: React.ReactNode }) {
   const { theme } = useTheme();
@@ -20,7 +18,6 @@ export default function Layout({ children }: { children: React.ReactNode }) {
       <style jsx global>{`
         html {
           scroll-behavior: smooth;
-          overflow: auto;
           background-color: ${!isDarkMode ? "hsl(0deg 0% 97.3%)" : "#161616"};
         }
       `}</style>

apps/web/src/views/home/components/Pricing.tsx

@@ -2,7 +2,7 @@ import Link from "next/link";
 import { Radio, RadioGroup } from "@headlessui/react";
 import { t } from "@lingui/core/macro";
 import { useState } from "react";
-import { HiBolt, HiCheckCircle } from "react-icons/hi2";
+import { HiCheckCircle } from "react-icons/hi2";
 import { twMerge } from "tailwind-merge";
 
 type Frequency = "monthly" | "annually";
@@ -92,13 +92,7 @@ const Pricing = () => {
           {t`Get started for free, with no usage limits. For collaboration, upgrade to a plan that fits the size of your team.`}
         </p>
 
-        <div className="mt-12 flex flex-col items-center justify-center">
-          <div className="mb-4 flex items-center gap-2 rounded-full border bg-white px-4 py-1.5 text-center text-xs font-bold text-gray-800 dark:border-dark-300 dark:bg-white dark:text-gray-800 lg:text-sm">
-            <HiBolt />
-            <p>
-              {t`Launch offer: unlimited seats for just $29/month with Pro`}
-            </p>
-          </div>
+        <div className="mt-16 flex justify-center">
           <fieldset aria-label={t`Payment frequency`}>
             <RadioGroup
               value={frequency}
@@ -171,7 +165,7 @@ const Pricing = () => {
                   !tier.showPrice && "opacity-0",
                 )}
               >
-                {tier.price[frequency?.value ?? "monthly"]}
+                {tier.price[frequency?.value || "monthly"]}
               </span>
               {tier.showPriceSuffix && (
                 <span className="text-sm/6 font-semibold text-light-50 dark:text-dark-900">

apps/web/src/views/members/components/InviteMemberForm.tsx

@@ -7,9 +7,7 @@ import { HiXMark } from "react-icons/hi2";
 import { z } from "zod";
 
 import type { InviteMemberInput } from "@kan/api/types";
-import type { Subscription } from "@kan/shared/utils";
 import { authClient } from "@kan/auth/client";
-import { getSubscriptionByPlan } from "@kan/shared/utils";
 
 import Button from "~/components/Button";
 import Input from "~/components/Input";
@@ -21,13 +19,20 @@ import { api } from "~/utils/api";
 
 export function InviteMemberForm({
   numberOfMembers,
-  subscriptions,
-  unlimitedSeats,
+  activeTeamSubscription,
   userId,
 }: {
   numberOfMembers: number;
-  subscriptions: Subscription[] | undefined;
-  unlimitedSeats: boolean;
+  activeTeamSubscription:
+    | {
+        id: number | null;
+        plan: string;
+        status: string;
+        seats: number | null;
+        periodStart: Date | null;
+        periodEnd: Date | null;
+      }
+    | undefined;
   userId: string | undefined;
 }) {
   const utils = api.useUtils();
@@ -82,19 +87,16 @@ export function InviteMemberForm({
     },
   });
 
-  const teamSubscription = getSubscriptionByPlan(subscriptions, "team");
-  const proSubscription = getSubscriptionByPlan(subscriptions, "pro");
-
-  const hasTeamSubscription = !!teamSubscription;
-  const hasProSubscription = !!proSubscription;
-
   let isYearly = false;
   let price = t`$10/month`;
   let billingType = t`monthly billing`;
 
-  if (teamSubscription?.periodStart && teamSubscription?.periodEnd) {
-    const periodStartDate = new Date(teamSubscription.periodStart);
-    const periodEndDate = new Date(teamSubscription.periodEnd);
+  if (
+    activeTeamSubscription?.periodStart &&
+    activeTeamSubscription?.periodEnd
+  ) {
+    const periodStartDate = new Date(activeTeamSubscription.periodStart);
+    const periodEndDate = new Date(activeTeamSubscription.periodEnd);
     const diffInDays = Math.round(
       (periodEndDate.getTime() - periodStartDate.getTime()) /
         (1000 * 60 * 60 * 24),
@@ -161,8 +163,7 @@ export function InviteMemberForm({
           placeholder={t`Email`}
           disabled={
             env("NEXT_PUBLIC_KAN_ENV") === "cloud" &&
-            !hasTeamSubscription &&
-            !hasProSubscription
+            !activeTeamSubscription?.id
           }
           {...register("email", { required: true })}
           onKeyDown={async (e) => {
@@ -176,15 +177,13 @@ export function InviteMemberForm({
 
         {env("NEXT_PUBLIC_KAN_ENV") === "cloud" && (
           <div className="mt-3 rounded-md bg-light-100 p-3 text-xs text-light-900 dark:bg-dark-200 dark:text-dark-900">
-            {hasTeamSubscription || hasProSubscription ? (
+            {activeTeamSubscription?.id ? (
               <div>
                 <span className="font-medium text-emerald-500 dark:text-emerald-400">
-                  {hasTeamSubscription ? t`Team Plan` : t`Pro Plan ∞`}
+                  {t`Team Plan`}
                 </span>
                 <p className="mt-1">
-                  {unlimitedSeats
-                    ? t`You have unlimited seats with your Pro Plan. There is no additional charge for new members!`
-                    : t`Adding a new member will cost an additional ${price} (${billingType}) per seat.`}
+                  {t`Adding a new member will cost an additional ${price} (${billingType}) per seat.`}
                 </p>
               </div>
             ) : (
@@ -202,7 +201,7 @@ export function InviteMemberForm({
       </div>
 
       <div className="mt-12 flex items-center justify-end border-t border-light-600 px-5 pb-5 pt-5 dark:border-dark-600">
-        {(hasTeamSubscription || hasProSubscription) &&
+        {activeTeamSubscription?.id &&
           env("NEXT_PUBLIC_KAN_ENV") === "cloud" && (
             <Toggle
               label={t`Invite another`}
@@ -214,8 +213,7 @@ export function InviteMemberForm({
           )}
         <div>
           {env("NEXT_PUBLIC_KAN_ENV") === "cloud" &&
-          !hasTeamSubscription &&
-          !hasProSubscription ? (
+          !activeTeamSubscription?.id ? (
             <Button
               type="button"
               onClick={handleUpgrade}

apps/web/src/views/members/index.tsx

@@ -1,16 +1,8 @@
-import Link from "next/link";
 import { t } from "@lingui/core/macro";
-import { env } from "next-runtime-env";
-import {
-  HiBolt,
-  HiEllipsisHorizontal,
-  HiOutlinePlusSmall,
-} from "react-icons/hi2";
+import { HiEllipsisHorizontal, HiOutlinePlusSmall } from "react-icons/hi2";
 import { twMerge } from "tailwind-merge";
 
-import type { Subscription } from "@kan/shared/utils";
 import { authClient } from "@kan/auth/client";
-import { getSubscriptionByPlan, hasUnlimitedSeats } from "@kan/shared/utils";
 
 import Avatar from "~/components/Avatar";
 import Button from "~/components/Button";
@@ -19,6 +11,7 @@ import FeedbackModal from "~/components/FeedbackModal";
 import Modal from "~/components/modal";
 import { NewWorkspaceForm } from "~/components/NewWorkspaceForm";
 import { PageHead } from "~/components/PageHead";
+import { env } from "~/env";
 import { useModal } from "~/providers/modal";
 import { useWorkspace } from "~/providers/workspace";
 import { api } from "~/utils/api";
@@ -37,12 +30,13 @@ export default function MembersPage() {
 
   const { data: session } = authClient.useSession();
 
-  const subscriptions = data?.subscriptions as Subscription[] | undefined;
+  const subscription = data?.subscriptions;
 
-  const teamSubscription = getSubscriptionByPlan(subscriptions, "team");
-  const proSubscription = getSubscriptionByPlan(subscriptions, "pro");
-
-  const unlimitedSeats = hasUnlimitedSeats(subscriptions);
+  const activeTeamSubscription = subscription?.find(
+    (sub: any) =>
+      sub.status === "active" ||
+      (sub.status === "trialing" && sub.plan === "team"),
+  );
 
   const TableRow = ({
     memberPublicId,
@@ -129,9 +123,9 @@ export default function MembersPage() {
                 {memberRole &&
                   memberRole.charAt(0).toUpperCase() + memberRole.slice(1)}
               </span>
-              {(memberStatus === "invited" || memberStatus === "paused") && (
+              {memberStatus === "invited" && (
                 <span className="mt-1 inline-flex items-center rounded-md bg-gray-500/10 px-1.5 py-0.5 text-[10px] font-medium text-gray-400 ring-1 ring-inset ring-gray-500/20 sm:ml-2 sm:mt-0 sm:text-[11px]">
-                  {memberStatus === "invited" ? t`Pending` : t`Paused`}
+                  {t`Pending`}
                 </span>
               )}
             </div>
@@ -173,45 +167,23 @@ export default function MembersPage() {
       <PageHead title={t`Members | ${workspace.name ?? "Workspace"}`} />
       <div className="m-auto h-full max-w-[1100px] p-6 px-5 md:px-28 md:py-12">
         <div className="mb-8 flex w-full justify-between">
+          <h1 className="font-bold tracking-tight text-neutral-900 dark:text-dark-1000 sm:text-[1.2rem]">
+            {t`Members`}
+          </h1>
           <div className="flex items-center gap-3">
-            <h1 className="font-bold tracking-tight text-neutral-900 dark:text-dark-1000 sm:text-[1.2rem]">
-              {t`Members`}
-            </h1>
-          </div>
-          <div className="flex items-center gap-3">
-            {env("NEXT_PUBLIC_KAN_ENV") === "cloud" && (
-              <>
-                {!proSubscription && (
-                  <Link
-                    href="/settings/workspace?upgrade=pro"
-                    className="hidden items-center rounded-full border border-emerald-300 bg-emerald-50 px-3 py-1 text-center text-xs text-emerald-400 dark:border-emerald-700 dark:bg-emerald-950 dark:text-emerald-400 lg:flex"
-                  >
-                    <HiBolt />
-                    <span className="ml-1 font-medium">
-                      {t`Launch offer: Get unlimited members with Pro`}
-                    </span>
-                  </Link>
+            {env.NEXT_PUBLIC_KAN_ENV === "cloud" && (
+              <div
+                className={twMerge(
+                  "flex items-center rounded-full border px-3 py-1 text-center text-xs",
+                  activeTeamSubscription
+                    ? "border-emerald-300 bg-emerald-50 text-emerald-400 dark:border-emerald-700 dark:bg-emerald-950 dark:text-emerald-400"
+                    : "border-light-300 bg-light-50 text-light-1000 dark:border-dark-300 dark:bg-dark-50 dark:text-dark-900",
                 )}
-                <div
-                  className={twMerge(
-                    "flex items-center rounded-full border px-3 py-1 text-center text-xs",
-                    teamSubscription || proSubscription
-                      ? "border-emerald-300 bg-emerald-50 text-emerald-400 dark:border-emerald-700 dark:bg-emerald-950 dark:text-emerald-400"
-                      : "border-light-300 bg-light-50 text-light-1000 dark:border-dark-300 dark:bg-dark-50 dark:text-dark-900",
-                  )}
-                >
-                  <span className="font-medium">
-                    {proSubscription
-                      ? t`Pro Plan`
-                      : teamSubscription
-                        ? t`Team Plan`
-                        : t`Free Plan`}
-                    {proSubscription && unlimitedSeats && (
-                      <span className="ml-1 text-xs">∞</span>
-                    )}
-                  </span>
-                </div>
-              </>
+              >
+                <span className="font-medium">
+                  {activeTeamSubscription ? t`Team Plan` : t`Free Plan`}
+                </span>
+              </div>
             )}
             <Button
               onClick={() => openModal("INVITE_MEMBER")}
@@ -296,8 +268,7 @@ export default function MembersPage() {
             <InviteMemberForm
               userId={session?.user.id}
               numberOfMembers={data?.members.length ?? 1}
-              subscriptions={subscriptions}
-              unlimitedSeats={unlimitedSeats}
+              activeTeamSubscription={activeTeamSubscription}
             />
           </Modal>
 

apps/web/src/views/settings/AccountSettings.tsx

@@ -1,116 +0,0 @@
-import { t } from "@lingui/core/macro";
-import { env } from "next-runtime-env";
-
-import Button from "~/components/Button";
-import FeedbackModal from "~/components/FeedbackModal";
-import { LanguageSelector } from "~/components/LanguageSelector";
-import Modal from "~/components/modal";
-import { NewWorkspaceForm } from "~/components/NewWorkspaceForm";
-import { PageHead } from "~/components/PageHead";
-import { useModal } from "~/providers/modal";
-import { api } from "~/utils/api";
-import Avatar from "./components/Avatar";
-import { ChangePasswordFormConfirmation } from "./components/ChangePasswordConfirmation";
-import { DeleteAccountConfirmation } from "./components/DeleteAccountConfirmation";
-import UpdateDisplayNameForm from "./components/UpdateDisplayNameForm";
-
-export default function AccountSettings() {
-  const { modalContentType, openModal, isOpen } = useModal();
-  const isCredentialsEnabled =
-    env("NEXT_PUBLIC_ALLOW_CREDENTIALS")?.toLowerCase() === "true";
-  const { data } = api.user.getUser.useQuery();
-
-  return (
-    <>
-      <PageHead title={t`Settings | Account`} />
-
-      <div className="mb-8 border-t border-light-300 dark:border-dark-300">
-        <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
-          {t`Profile picture`}
-        </h2>
-        <Avatar userId={data?.id} userImage={data?.image} />
-
-        <div className="mb-4">
-          <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
-            {t`Display name`}
-          </h2>
-          <UpdateDisplayNameForm displayName={data?.name ?? ""} />
-        </div>
-
-        <div className="mb-8 border-t border-light-300 dark:border-dark-300">
-          <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
-            {t`Language`}
-          </h2>
-          <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
-            {t`Change your language preferences.`}
-          </p>
-          <LanguageSelector />
-        </div>
-
-        <div className="mb-8 border-t border-light-300 dark:border-dark-300">
-          <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
-            {t`Delete account`}
-          </h2>
-          <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
-            {t`Once you delete your account, there is no going back. This action cannot be undone.`}
-          </p>
-          <div className="mt-4">
-            <Button
-              variant="secondary"
-              onClick={() => openModal("DELETE_ACCOUNT")}
-            >
-              {t`Delete account`}
-            </Button>
-          </div>
-        </div>
-
-        {isCredentialsEnabled && (
-          <div className="mb-8 border-t border-light-300 dark:border-dark-300">
-            <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
-              {t`Change Password`}
-            </h2>
-            <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
-              {t`You are about to change your password.`}
-            </p>
-            <div className="mt-4">
-              <Button
-                variant="secondary"
-                onClick={() => openModal("CHANGE_PASSWORD")}
-              >
-                {t`Change Password`}
-              </Button>
-            </div>
-          </div>
-        )}
-      </div>
-
-      {/* Account-specific modals */}
-      <Modal
-        modalSize="sm"
-        isVisible={isOpen && modalContentType === "DELETE_ACCOUNT"}
-      >
-        <DeleteAccountConfirmation />
-      </Modal>
-      <Modal
-        modalSize="sm"
-        isVisible={isOpen && modalContentType === "CHANGE_PASSWORD"}
-      >
-        <ChangePasswordFormConfirmation />
-      </Modal>
-
-      {/* Global modals */}
-      <Modal
-        modalSize="md"
-        isVisible={isOpen && modalContentType === "NEW_FEEDBACK"}
-      >
-        <FeedbackModal />
-      </Modal>
-      <Modal
-        modalSize="sm"
-        isVisible={isOpen && modalContentType === "NEW_WORKSPACE"}
-      >
-        <NewWorkspaceForm />
-      </Modal>
-    </>
-  );
-}

apps/web/src/views/settings/ApiSettings.tsx

@@ -1,66 +0,0 @@
-import { t } from "@lingui/core/macro";
-
-import Button from "~/components/Button";
-import FeedbackModal from "~/components/FeedbackModal";
-import Modal from "~/components/modal";
-import { NewWorkspaceForm } from "~/components/NewWorkspaceForm";
-import { PageHead } from "~/components/PageHead";
-import { useModal } from "~/providers/modal";
-import ApiKeyList from "./components/ApiKeyList";
-import NewApiKeyModal from "./components/NewApiKeyModal";
-import { RevokeApiKeyConfirmation } from "./components/RevokeApiKeyConfirmation";
-
-export default function ApiSettings() {
-  const { modalContentType, openModal, isOpen } = useModal();
-
-  return (
-    <>
-      <PageHead title={t`Settings | API`} />
-
-      <div className="mb-8 border-t border-light-300 dark:border-dark-300">
-        <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
-          {t`API keys`}
-        </h2>
-        <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
-          {t`View and manage your API keys.`}
-        </p>
-
-        <div className="mb-4 flex items-center justify-between">
-          <Button variant="primary" onClick={() => openModal("NEW_API_KEY")}>
-            {t`Create new key`}
-          </Button>
-        </div>
-
-        <ApiKeyList />
-      </div>
-
-      {/* API-specific modals */}
-      <Modal
-        modalSize="sm"
-        isVisible={isOpen && modalContentType === "NEW_API_KEY"}
-      >
-        <NewApiKeyModal />
-      </Modal>
-      <Modal
-        modalSize="sm"
-        isVisible={isOpen && modalContentType === "REVOKE_API_KEY"}
-      >
-        <RevokeApiKeyConfirmation />
-      </Modal>
-
-      {/* Global modals */}
-      <Modal
-        modalSize="md"
-        isVisible={isOpen && modalContentType === "NEW_FEEDBACK"}
-      >
-        <FeedbackModal />
-      </Modal>
-      <Modal
-        modalSize="sm"
-        isVisible={isOpen && modalContentType === "NEW_WORKSPACE"}
-      >
-        <NewWorkspaceForm />
-      </Modal>
-    </>
-  );
-}

apps/web/src/views/settings/BillingSettings.tsx

@@ -1,68 +0,0 @@
-import { t } from "@lingui/core/macro";
-import { HiMiniArrowTopRightOnSquare } from "react-icons/hi2";
-
-import Button from "~/components/Button";
-import FeedbackModal from "~/components/FeedbackModal";
-import Modal from "~/components/modal";
-import { NewWorkspaceForm } from "~/components/NewWorkspaceForm";
-import { PageHead } from "~/components/PageHead";
-import { useModal } from "~/providers/modal";
-
-export default function BillingSettings() {
-  const { modalContentType, isOpen } = useModal();
-
-  const handleOpenBillingPortal = async () => {
-    try {
-      const response = await fetch("/api/stripe/create_billing_session", {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-      });
-
-      const { url } = (await response.json()) as { url: string };
-
-      if (url) {
-        window.location.href = url;
-      }
-    } catch (error) {
-      console.error("Error creating billing session:", error);
-    }
-  };
-
-  return (
-    <>
-      <PageHead title={t`Settings | Billing`} />
-
-      <div className="mb-8 border-t border-light-300 dark:border-dark-300">
-        <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
-          {t`Billing`}
-        </h2>
-        <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
-          {t`View and manage your billing and subscription.`}
-        </p>
-        <Button
-          variant="primary"
-          iconRight={<HiMiniArrowTopRightOnSquare />}
-          onClick={handleOpenBillingPortal}
-        >
-          {t`Billing portal`}
-        </Button>
-      </div>
-
-      {/* Global modals */}
-      <Modal
-        modalSize="md"
-        isVisible={isOpen && modalContentType === "NEW_FEEDBACK"}
-      >
-        <FeedbackModal />
-      </Modal>
-      <Modal
-        modalSize="sm"
-        isVisible={isOpen && modalContentType === "NEW_WORKSPACE"}
-      >
-        <NewWorkspaceForm />
-      </Modal>
-    </>
-  );
-}

apps/web/src/views/settings/IntegrationsSettings.tsx

@@ -1,130 +0,0 @@
-import { t } from "@lingui/core/macro";
-import { useEffect } from "react";
-import { HiMiniArrowTopRightOnSquare } from "react-icons/hi2";
-
-import Button from "~/components/Button";
-import FeedbackModal from "~/components/FeedbackModal";
-import Modal from "~/components/modal";
-import { NewWorkspaceForm } from "~/components/NewWorkspaceForm";
-import { PageHead } from "~/components/PageHead";
-import { useModal } from "~/providers/modal";
-import { usePopup } from "~/providers/popup";
-import { api } from "~/utils/api";
-
-export default function IntegrationsSettings() {
-  const { modalContentType, isOpen } = useModal();
-  const { showPopup } = usePopup();
-
-  const {
-    data: integrations,
-    refetch: refetchIntegrations,
-    isLoading: integrationsLoading,
-  } = api.integration.providers.useQuery();
-
-  const { data: trelloUrl, refetch: refetchTrelloUrl } =
-    api.integration.getAuthorizationUrl.useQuery(
-      { provider: "trello" },
-      {
-        enabled:
-          !integrationsLoading &&
-          !integrations?.some(
-            (integration) => integration.provider === "trello",
-          ),
-        refetchOnWindowFocus: true,
-      },
-    );
-
-  useEffect(() => {
-    const handleFocus = () => {
-      refetchIntegrations();
-    };
-    window.addEventListener("focus", handleFocus);
-    return () => {
-      window.removeEventListener("focus", handleFocus);
-    };
-  }, [refetchIntegrations]);
-
-  const { mutateAsync: disconnectTrello } =
-    api.integration.disconnect.useMutation({
-      onSuccess: () => {
-        refetchIntegrations();
-        refetchTrelloUrl();
-        showPopup({
-          header: t`Trello disconnected`,
-          message: t`Your Trello account has been disconnected.`,
-          icon: "success",
-        });
-      },
-      onError: () => {
-        showPopup({
-          header: t`Error disconnecting Trello`,
-          message: t`An error occurred while disconnecting your Trello account.`,
-          icon: "error",
-        });
-      },
-    });
-
-  return (
-    <>
-      <PageHead title={t`Settings | Integrations`} />
-
-      <div className="mb-8 border-t border-light-300 dark:border-dark-300">
-        <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
-          {t`Trello`}
-        </h2>
-        {!integrations?.some(
-          (integration) => integration.provider === "trello",
-        ) && trelloUrl ? (
-          <>
-            <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
-              {t`Connect your Trello account to import boards.`}
-            </p>
-            <Button
-              variant="primary"
-              iconRight={<HiMiniArrowTopRightOnSquare />}
-              onClick={() =>
-                window.open(
-                  trelloUrl.url,
-                  "trello_auth",
-                  "height=800,width=600",
-                )
-              }
-            >
-              {t`Connect Trello`}
-            </Button>
-          </>
-        ) : (
-          integrations?.some(
-            (integration) => integration.provider === "trello",
-          ) && (
-            <>
-              <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
-                {t`Your Trello account is connected.`}
-              </p>
-              <Button
-                variant="secondary"
-                onClick={() => disconnectTrello({ provider: "trello" })}
-              >
-                {t`Disconnect Trello`}
-              </Button>
-            </>
-          )
-        )}
-      </div>
-
-      {/* Global modals */}
-      <Modal
-        modalSize="md"
-        isVisible={isOpen && modalContentType === "NEW_FEEDBACK"}
-      >
-        <FeedbackModal />
-      </Modal>
-      <Modal
-        modalSize="sm"
-        isVisible={isOpen && modalContentType === "NEW_WORKSPACE"}
-      >
-        <NewWorkspaceForm />
-      </Modal>
-    </>
-  );
-}

apps/web/src/views/settings/WorkspaceSettings.tsx

@@ -1,145 +0,0 @@
-import { useRouter } from "next/router";
-import { t } from "@lingui/core/macro";
-import { env } from "next-runtime-env";
-import { useEffect, useState } from "react";
-import { HiBolt } from "react-icons/hi2";
-
-import type { Subscription } from "@kan/shared/utils";
-import { hasActiveSubscription } from "@kan/shared/utils";
-
-import Button from "~/components/Button";
-import FeedbackModal from "~/components/FeedbackModal";
-import Modal from "~/components/modal";
-import { NewWorkspaceForm } from "~/components/NewWorkspaceForm";
-import { PageHead } from "~/components/PageHead";
-import { useModal } from "~/providers/modal";
-import { useWorkspace } from "~/providers/workspace";
-import { api } from "~/utils/api";
-import { DeleteWorkspaceConfirmation } from "./components/DeleteWorkspaceConfirmation";
-import UpdateWorkspaceDescriptionForm from "./components/UpdateWorkspaceDescriptionForm";
-import UpdateWorkspaceNameForm from "./components/UpdateWorkspaceNameForm";
-import UpdateWorkspaceUrlForm from "./components/UpdateWorkspaceUrlForm";
-import { UpgradeToProConfirmation } from "./components/UpgradeToProConfirmation";
-
-export default function WorkspaceSettings() {
-  const { modalContentType, openModal, isOpen } = useModal();
-  const { workspace } = useWorkspace();
-  const router = useRouter();
-  const { data } = api.user.getUser.useQuery();
-  const [hasOpenedUpgradeModal, setHasOpenedUpgradeModal] = useState(false);
-
-  const { data: workspaceData } = api.workspace.byId.useQuery({
-    workspacePublicId: workspace.publicId,
-  });
-
-  const subscriptions = workspaceData?.subscriptions as
-    | Subscription[]
-    | undefined;
-
-  // Open upgrade modal if upgrade=pro is in URL params
-  useEffect(() => {
-    if (
-      router.query.upgrade === "pro" &&
-      env("NEXT_PUBLIC_KAN_ENV") === "cloud" &&
-      !hasActiveSubscription(subscriptions, "pro") &&
-      !hasOpenedUpgradeModal
-    ) {
-      openModal("UPGRADE_TO_PRO");
-      setHasOpenedUpgradeModal(true);
-    }
-  }, [router.query.upgrade, subscriptions, openModal, hasOpenedUpgradeModal]);
-
-  return (
-    <>
-      <PageHead title={t`Settings | Workspace`} />
-
-      <div className="mb-8 border-t border-light-300 dark:border-dark-300">
-        <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
-          {t`Workspace name`}
-        </h2>
-        <UpdateWorkspaceNameForm
-          workspacePublicId={workspace.publicId}
-          workspaceName={workspace.name}
-        />
-
-        <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
-          {t`Workspace URL`}
-        </h2>
-        <UpdateWorkspaceUrlForm
-          workspacePublicId={workspace.publicId}
-          workspaceUrl={workspace.slug ?? ""}
-          workspacePlan={workspace.plan ?? "free"}
-        />
-
-        <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
-          {t`Workspace description`}
-        </h2>
-        <UpdateWorkspaceDescriptionForm
-          workspacePublicId={workspace.publicId}
-          workspaceDescription={workspace.description ?? ""}
-        />
-
-        {env("NEXT_PUBLIC_KAN_ENV") === "cloud" &&
-          !hasActiveSubscription(subscriptions, "pro") && (
-            <div className="my-8">
-              <Button
-                onClick={() => openModal("UPGRADE_TO_PRO")}
-                iconRight={<HiBolt />}
-              >
-                {t`Upgrade to Pro`}
-              </Button>
-            </div>
-          )}
-
-        <div className="border-t border-light-300 dark:border-dark-300">
-          <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
-            {t`Delete workspace`}
-          </h2>
-          <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
-            {t`Once you delete your workspace, there is no going back. This action cannot be undone.`}
-          </p>
-          <div className="mt-4">
-            <Button
-              variant="secondary"
-              onClick={() => openModal("DELETE_WORKSPACE")}
-              disabled={workspace.role !== "admin"}
-            >
-              {t`Delete workspace`}
-            </Button>
-          </div>
-        </div>
-      </div>
-
-      {/* Workspace-specific modals */}
-      <Modal
-        modalSize="sm"
-        isVisible={isOpen && modalContentType === "DELETE_WORKSPACE"}
-      >
-        <DeleteWorkspaceConfirmation />
-      </Modal>
-      <Modal
-        modalSize="sm"
-        isVisible={isOpen && modalContentType === "UPGRADE_TO_PRO"}
-      >
-        <UpgradeToProConfirmation
-          userId={data?.id ?? ""}
-          workspacePublicId={workspace.publicId}
-        />
-      </Modal>
-
-      {/* Global modals */}
-      <Modal
-        modalSize="md"
-        isVisible={isOpen && modalContentType === "NEW_FEEDBACK"}
-      >
-        <FeedbackModal />
-      </Modal>
-      <Modal
-        modalSize="sm"
-        isVisible={isOpen && modalContentType === "NEW_WORKSPACE"}
-      >
-        <NewWorkspaceForm />
-      </Modal>
-    </>
-  );
-}

apps/web/src/views/settings/components/ApiKeyList.tsx

@@ -1,202 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { HiEllipsisHorizontal } from "react-icons/hi2";
-import { twMerge } from "tailwind-merge";
-
-import { authClient } from "@kan/auth/client";
-
-import Dropdown from "~/components/Dropdown";
-import { useModal } from "~/providers/modal";
-
-export default function ApiKeyList() {
-  const { openModal } = useModal();
-
-  const { data, isLoading } = useQuery({
-    queryKey: ["apiKeys"],
-    queryFn: () => authClient.apiKey.list(),
-  });
-
-  const TableRow = ({
-    keyId,
-    keyName,
-    keyStart,
-    createdAt,
-    lastRequest,
-    isLastRow,
-    showSkeleton,
-  }: {
-    keyId?: string;
-    keyName?: string | null | undefined;
-    keyStart?: string | null | undefined;
-    createdAt?: Date | null;
-    lastRequest?: Date | null;
-    isLastRow?: boolean | undefined;
-    showSkeleton?: boolean | undefined;
-  }) => {
-    const formatDate = (date?: Date | string | null) => {
-      if (!date) return "Never";
-      const dateObj = date instanceof Date ? date : new Date(date);
-      return dateObj.toLocaleDateString("en-US", {
-        year: "numeric",
-        month: "short",
-        day: "numeric",
-      });
-    };
-
-    return (
-      <tr className="rounded-b-lg">
-        <td className={twMerge("w-[30%]", isLastRow ? "rounded-bl-lg" : "")}>
-          <div className="flex items-center p-4">
-            <div className="ml-2 min-w-0 flex-1">
-              <div>
-                <div className="flex items-center">
-                  <p
-                    className={twMerge(
-                      "mr-2 text-sm font-medium text-light-900 dark:text-dark-900",
-                      showSkeleton &&
-                        "md mb-2 h-3 w-[125px] animate-pulse rounded-sm bg-light-200 dark:bg-dark-200",
-                    )}
-                  >
-                    {keyName}
-                  </p>
-                </div>
-              </div>
-            </div>
-          </div>
-        </td>
-        <td className="w-[20%] px-3 py-4">
-          <p
-            className={twMerge(
-              "text-sm text-light-900 dark:text-dark-900",
-              showSkeleton &&
-                "h-3 w-[80px] animate-pulse rounded-sm bg-light-200 dark:bg-dark-200",
-            )}
-          >
-            {formatDate(createdAt)}
-          </p>
-        </td>
-        <td className="w-[20%] px-3 py-4">
-          <p
-            className={twMerge(
-              "text-sm text-light-900 dark:text-dark-900",
-              showSkeleton &&
-                "h-3 w-[80px] animate-pulse rounded-sm bg-light-200 dark:bg-dark-200",
-            )}
-          >
-            {formatDate(lastRequest)}
-          </p>
-        </td>
-        <td className="w-[25%] px-3 py-4">
-          <div>
-            <span
-              className={twMerge(
-                "inline-flex items-center rounded-md bg-emerald-500/10 px-1.5 py-0.5 text-[11px] font-medium text-emerald-400 ring-1 ring-inset ring-emerald-500/20",
-                showSkeleton &&
-                  "h-5 w-[50px] animate-pulse bg-light-200 ring-0 dark:bg-dark-200",
-              )}
-            >
-              {keyStart}...
-            </span>
-          </div>
-        </td>
-        <td
-          className={twMerge(
-            "w-[5%] min-w-[50px]",
-            isLastRow && "rounded-br-lg",
-          )}
-        >
-          <div className="flex w-full items-center justify-center px-3">
-            <div className="relative z-50">
-              <Dropdown
-                items={[
-                  {
-                    label: "Revoke",
-                    action: () =>
-                      openModal("REVOKE_API_KEY", keyId, keyName ?? ""),
-                  },
-                ]}
-              >
-                <HiEllipsisHorizontal
-                  size={25}
-                  className="text-light-900 dark:text-dark-900"
-                />
-              </Dropdown>
-            </div>
-          </div>
-        </td>
-      </tr>
-    );
-  };
-
-  if (!isLoading && (!data?.data || data.data.length === 0)) {
-    return null;
-  }
-
-  return (
-    <div className="mt-8 flow-root">
-      <div className="overflow-x-auto overflow-y-visible">
-        <div className="inline-block min-w-full py-2 pb-12 align-middle">
-          <div className="relative h-full shadow ring-1 ring-black ring-opacity-5 sm:rounded-lg">
-            <table className="min-w-[600px] divide-y divide-light-600 dark:divide-dark-600">
-              <thead className="rounded-t-lg bg-light-300 dark:bg-dark-200">
-                <tr>
-                  <th
-                    scope="col"
-                    className="w-[30%] rounded-tl-lg py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-light-900 dark:text-dark-900 sm:pl-6"
-                  >
-                    Name
-                  </th>
-                  <th
-                    scope="col"
-                    className="w-[20%] px-3 py-3.5 text-left text-sm font-semibold text-light-900 dark:text-dark-900"
-                  >
-                    Created
-                  </th>
-                  <th
-                    scope="col"
-                    className="w-[20%] px-3 py-3.5 text-left text-sm font-semibold text-light-900 dark:text-dark-900"
-                  >
-                    Last Used
-                  </th>
-                  <th
-                    scope="col"
-                    className="w-[25%] px-3 py-3.5 text-left text-sm font-semibold text-light-900 dark:text-dark-900"
-                  >
-                    Key
-                  </th>
-                  <th
-                    scope="col"
-                    className="w-[5%] rounded-tr-lg px-3 py-3.5 text-center text-sm font-semibold text-light-900 dark:text-dark-900"
-                  >
-                    {/* Actions column */}
-                  </th>
-                </tr>
-              </thead>
-              <tbody className="divide-y divide-light-600 bg-light-50 dark:divide-dark-600 dark:bg-dark-100">
-                {!isLoading &&
-                  data?.data?.map((apiKey, index) => (
-                    <TableRow
-                      key={apiKey.id}
-                      keyId={apiKey.id}
-                      keyName={apiKey.name}
-                      keyStart={apiKey.start}
-                      createdAt={apiKey.createdAt}
-                      lastRequest={apiKey.lastRequest}
-                      isLastRow={index === data.data.length - 1}
-                    />
-                  ))}
-
-                {isLoading && (
-                  <>
-                    <TableRow showSkeleton />
-                    <TableRow showSkeleton />
-                    <TableRow showSkeleton isLastRow />
-                  </>
-                )}
-              </tbody>
-            </table>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

apps/web/src/views/settings/components/Avatar.tsx

@@ -1,45 +1,14 @@
 import Image from "next/image";
 import { t } from "@lingui/core/macro";
 import { env } from "next-runtime-env";
-import { useCallback, useRef, useState } from "react";
-import ReactCrop from "react-image-crop";
-
-import "react-image-crop/dist/ReactCrop.css";
+import { useState } from "react";
 
 import { generateUID } from "@kan/shared/utils";
 
-import Button from "~/components/Button";
-import Modal from "~/components/modal";
 import { usePopup } from "~/providers/popup";
 import { api } from "~/utils/api";
 import { getAvatarUrl } from "~/utils/helpers";
 
-interface PercentCrop {
-  unit: "%";
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-}
-
-interface LocalPixelCrop {
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-}
-
-interface ReactCropProps {
-  crop: PercentCrop | undefined;
-  onChange: (crop: LocalPixelCrop, percentCrop: PercentCrop) => void;
-  aspect?: number;
-  className?: string;
-  circularCrop?: boolean;
-  children: React.ReactNode;
-}
-
-const AnyReactCrop = ReactCrop as unknown as React.FC<ReactCropProps>;
-
 export default function Avatar({
   userId,
   userImage,
@@ -50,13 +19,6 @@ export default function Avatar({
   const utils = api.useUtils();
   const { showPopup } = usePopup();
   const [uploading, setUploading] = useState(false);
-  const [cropDialogOpen, setCropDialogOpen] = useState(false);
-  const [selectedFile, setSelectedFile] = useState<File | null>(null);
-  const [selectedPreviewUrl, setSelectedPreviewUrl] = useState<string | null>(
-    null,
-  );
-  const [crop, setCrop] = useState<PercentCrop>();
-  const imgRef = useRef<HTMLImageElement | null>(null);
 
   const updateUser = api.user.update.useMutation({
     onSuccess: async () => {
@@ -83,109 +45,24 @@ export default function Avatar({
 
   const avatarUrl = userImage ? getAvatarUrl(userImage) : undefined;
 
-  const onFileChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    event.preventDefault();
-    const file = event.target.files?.[0] ?? null;
-    if (!file || !userId) {
-      return showPopup({
-        header: t`Error uploading profile image`,
-        message: t`Please select a file to upload.`,
-        icon: "error",
-      });
-    }
-    // Open crop dialog with preview
-    setSelectedFile(file);
-    const objUrl = URL.createObjectURL(file);
-    setSelectedPreviewUrl(objUrl);
-    setCropDialogOpen(true);
-  };
-
-  const onImageLoad = useCallback(
-    (e: React.SyntheticEvent<HTMLImageElement>) => {
-      const { naturalWidth, naturalHeight } = e.currentTarget;
-      // Create a centered square crop at ~90% of the smaller dimension
-      // Compute width% so that the square fits within the image
-      let widthPercent: number;
-      let heightPercent: number;
-      if (naturalWidth >= naturalHeight) {
-        // landscape: height is limiting
-        heightPercent = 90;
-        widthPercent = (naturalHeight / naturalWidth) * heightPercent;
-      } else {
-        // portrait: width is limiting
-        widthPercent = 90;
-        heightPercent = (naturalWidth / naturalHeight) * widthPercent;
-      }
-      const x = (100 - widthPercent) / 2;
-      const y = (100 - heightPercent) / 2;
-      setCrop({ unit: "%", x, y, width: widthPercent, height: heightPercent });
-    },
-    [],
-  );
-
-  const getCroppedBlob = useCallback(async (): Promise<Blob> => {
-    if (!imgRef.current || !crop) throw new Error("No crop to save");
-    const image = imgRef.current;
-
-    const canvas = document.createElement("canvas");
-    const cropXpx = (crop.x / 100) * image.naturalWidth;
-    const cropYpx = (crop.y / 100) * image.naturalHeight;
-    const cropWpx = (crop.width / 100) * image.naturalWidth;
-    const cropHpx = (crop.height / 100) * image.naturalHeight;
-    canvas.width = Math.max(1, Math.floor(cropWpx));
-    canvas.height = Math.max(1, Math.floor(cropHpx));
-    const ctx = canvas.getContext("2d");
-    if (!ctx) throw new Error("Canvas not supported");
-
-    // For better quality on HiDPI screens
-    const pixelRatio = window.devicePixelRatio || 1;
-    canvas.width = canvas.width * pixelRatio;
-    canvas.height = canvas.height * pixelRatio;
-    ctx.setTransform(pixelRatio, 0, 0, pixelRatio, 0, 0);
-    ctx.imageSmoothingQuality = "high";
-
-    ctx.drawImage(
-      image,
-      cropXpx,
-      cropYpx,
-      cropWpx,
-      cropHpx,
-      0,
-      0,
-      canvas.width / pixelRatio,
-      canvas.height / pixelRatio,
-    );
-
-    const mime = selectedFile?.type ?? "image/jpeg";
-    const blob: Blob = await new Promise((resolve, reject) => {
-      canvas.toBlob(
-        (b) => (b ? resolve(b) : reject(new Error("toBlob failed"))),
-        mime,
-      );
-    });
-    return blob;
-  }, [crop, selectedFile]);
-
-  const resetCropState = useCallback(() => {
-    setCrop(undefined);
-    setSelectedFile(null);
-    if (selectedPreviewUrl) URL.revokeObjectURL(selectedPreviewUrl);
-    setSelectedPreviewUrl(null);
-  }, [selectedPreviewUrl]);
-
-  const handleCancelCrop = useCallback(() => {
-    setCropDialogOpen(false);
-    resetCropState();
-  }, [resetCropState]);
-
-  const handleSaveCrop = useCallback(async () => {
+  const uploadAvatar = async (event: React.ChangeEvent<HTMLInputElement>) => {
     try {
-      if (!userId || !selectedFile) return;
-      setUploading(true);
-      const blob = await getCroppedBlob();
+      event.preventDefault();
 
-      const originalExt = selectedFile.name.split(".").pop() ?? "jpg";
-      const fileName = `${userId}/avatar-${generateUID()}.${originalExt}`;
+      const file = event.target.files?.[0];
+
+      if (!file || !userId) {
+        return showPopup({
+          header: t`Error uploading profile image`,
+          message: t`Please select a file to upload.`,
+          icon: "error",
+        });
+      }
+
+      const fileExt = file.name.split(".").pop();
+      const fileName = `${userId}/avatar-${generateUID()}.${fileExt}`;
+
+      setUploading(true);
 
       const response = await fetch(
         env("NEXT_PUBLIC_BASE_URL") + "/api/upload/image",
@@ -194,24 +71,26 @@ export default function Avatar({
           headers: {
             "Content-Type": "application/json",
           },
-          body: JSON.stringify({ filename: fileName, contentType: blob.type }),
+          body: JSON.stringify({ filename: fileName, contentType: file.type }),
         },
       );
 
       if (!response.ok) throw new Error("Failed to get pre-signed URL");
 
-      const { url } = (await response.json()) as { url: string };
+      const { url } = (await response.json()) as {
+        url: string;
+      };
 
       const uploadResponse = await fetch(url, {
         method: "PUT",
-        body: blob,
+        body: file,
       });
 
       if (!uploadResponse.ok) throw new Error("Failed to upload profile image");
 
-      updateUser.mutate({ image: fileName });
-      setCropDialogOpen(false);
-      resetCropState();
+      updateUser.mutate({
+        image: fileName,
+      });
     } catch (error) {
       console.error(error);
       showPopup({
@@ -222,14 +101,7 @@ export default function Avatar({
     } finally {
       setUploading(false);
     }
-  }, [
-    getCroppedBlob,
-    resetCropState,
-    selectedFile,
-    showPopup,
-    updateUser,
-    userId,
-  ]);
+  };
 
   return (
     <div>
@@ -239,7 +111,7 @@ export default function Avatar({
           type="file"
           id="single"
           accept="image/*"
-          onChange={onFileChange}
+          onChange={uploadAvatar}
           disabled={uploading}
         />
         {avatarUrl ? (
@@ -262,56 +134,6 @@ export default function Avatar({
           </span>
         )}
       </div>
-
-      {/* Crop Dialog */}
-      {cropDialogOpen && (
-        <Modal modalSize="md" positionFromTop="sm" isVisible>
-          <div className="p-4 sm:p-6">
-            <div className="mb-4">
-              <h3 className="text-base font-semibold text-light-1000 dark:text-dark-1000">
-                {t`Crop your avatar`}
-              </h3>
-              <p className="mt-1 text-sm text-light-800 dark:text-dark-800">
-                {t`Adjust the square crop to fit your avatar.`}
-              </p>
-            </div>
-            <div className="max-h-[80vh]">
-              <div className="rounded-md border border-light-600 p-2 dark:border-dark-600">
-                <AnyReactCrop
-                  crop={crop}
-                  onChange={(_crop: LocalPixelCrop, percentCrop: PercentCrop) =>
-                    setCrop(percentCrop)
-                  }
-                  aspect={1}
-                  circularCrop
-                  className="w-full"
-                >
-                  {/* eslint-disable-next-line @next/next/no-img-element */}
-                  <img
-                    ref={imgRef}
-                    src={selectedPreviewUrl ?? undefined}
-                    alt="Avatar to crop"
-                    onLoad={onImageLoad}
-                    className="h-auto max-h-[50vh] w-full object-contain"
-                  />
-                </AnyReactCrop>
-              </div>
-            </div>
-            <div className="mt-6 flex items-center justify-end gap-2">
-              <Button
-                variant="ghost"
-                onClick={handleCancelCrop}
-                disabled={uploading}
-              >
-                {t`Cancel`}
-              </Button>
-              <Button onClick={handleSaveCrop} isLoading={uploading}>
-                {t`Save`}
-              </Button>
-            </div>
-          </div>
-        </Modal>
-      )}
     </div>
   );
 }

apps/web/src/views/settings/components/CreateAPIKeyForm.tsx

@@ -0,0 +1,60 @@
+import { t } from "@lingui/core/macro";
+
+import { authClient } from "@kan/auth/client";
+
+import Button from "~/components/Button";
+import Input from "~/components/Input";
+
+const CreateAPIKeyForm = ({
+  apiKey,
+  refetchUser,
+}: {
+  apiKey:
+    | {
+        id: number;
+        prefix: string | null;
+        key: string;
+      }
+    | null
+    | undefined;
+  refetchUser: () => void;
+}) => {
+  const handleCreateAPIKey = async () => {
+    await authClient.apiKey.create({
+      name: "Kan API Key",
+      prefix: "kan_",
+    });
+
+    refetchUser();
+  };
+
+  const handleRevokeAPIKey = async () => {
+    if (!apiKey) return;
+    await authClient.apiKey.delete({
+      keyId: apiKey.id.toString(),
+    });
+
+    refetchUser();
+  };
+
+  return (
+    <div>
+      {apiKey ? (
+        <div className="flex gap-2">
+          <div className="mb-4 flex w-full max-w-[325px] items-center gap-2">
+            <Input value={apiKey.key} readOnly type="password" />
+          </div>
+          <div>
+            <Button variant="danger" onClick={handleRevokeAPIKey}>
+              {t`Revoke`}
+            </Button>
+          </div>
+        </div>
+      ) : (
+        <Button onClick={handleCreateAPIKey}>{t`Create new key`}</Button>
+      )}
+    </div>
+  );
+};
+
+export default CreateAPIKeyForm;

apps/web/src/views/settings/components/CustomURLConfirmation.tsx

@@ -0,0 +1,56 @@
+import { t } from "@lingui/core/macro";
+
+import Button from "~/components/Button";
+import { useModal } from "~/providers/modal";
+
+export function CustomURLConfirmation({
+  workspacePublicId,
+}: {
+  workspacePublicId: string;
+}) {
+  const { closeModal, entityId } = useModal();
+
+  const handleUpgrade = async () => {
+    try {
+      const response = await fetch("/api/stripe/create_checkout_session", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          slug: entityId,
+          workspacePublicId: workspacePublicId,
+          cancelUrl: "/settings",
+          successUrl: "/settings",
+        }),
+      });
+
+      const { url } = (await response.json()) as { url: string };
+
+      if (url) {
+        window.location.href = url;
+      }
+    } catch (error) {
+      console.error("Error creating checkout session:", error);
+    }
+  };
+
+  return (
+    <div className="p-5">
+      <div className="flex w-full flex-col justify-between pb-4">
+        <h2 className="text-md pb-4 font-medium text-neutral-900 dark:text-dark-1000">
+          {t`Confirm URL change`}
+        </h2>
+        <p className="text-sm font-medium text-light-900 dark:text-dark-900">
+          {t`Custom URLs are a premium feature. You'll be directed to upgrade your account.`}
+        </p>
+      </div>
+      <div className="mt-5 flex justify-end space-x-2 sm:mt-6">
+        <Button onClick={() => closeModal()} variant="secondary">
+          {t`Cancel`}
+        </Button>
+        <Button onClick={handleUpgrade}>{t`Upgrade`}</Button>
+      </div>
+    </div>
+  );
+}

apps/web/src/views/settings/components/NewApiKeyForm.tsx

@@ -1,69 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { useForm } from "react-hook-form";
-import { z } from "zod";
-
-import { authClient } from "@kan/auth/client";
-
-import Button from "~/components/Button";
-import Input from "~/components/Input";
-import { useModal } from "~/providers/modal";
-
-const newApiKeySchema = z.object({
-  name: z.string().min(1),
-});
-
-export default function NewApiKeyForm() {
-  const { openModal } = useModal();
-  const form = useForm({
-    resolver: zodResolver(newApiKeySchema),
-    defaultValues: {
-      name: "",
-    },
-  });
-
-  const qc = useQueryClient();
-
-  const createApiKeyMutation = useMutation({
-    mutationFn: ({ name }: { name: string }) =>
-      authClient.apiKey.create({ name, prefix: "kan_" }),
-    onSuccess: ({ data: apiKey }) => {
-      qc.invalidateQueries({
-        queryKey: ["apiKeys"],
-      });
-      openModal("API_KEY_CREATED", apiKey?.key, apiKey?.name ?? "");
-    },
-    onError: () => {
-      form.setError("name", {
-        type: "manual",
-        message: "Failed to create API key",
-      });
-    },
-  });
-
-  const handleSubmit = (data: z.infer<typeof newApiKeySchema>) => {
-    createApiKeyMutation.mutate({ name: data.name });
-  };
-
-  return (
-    <div className="px-2 py-2">
-      <form
-        onSubmit={form.handleSubmit(handleSubmit)}
-        className="flex flex-col gap-2"
-      >
-        <h2 className="text-sm font-bold text-neutral-900 dark:text-dark-1000">
-          New API key
-        </h2>
-        <Input
-          {...form.register("name")}
-          placeholder="Name"
-          className="w-full"
-          errorMessage={form.formState.errors.name?.message}
-        />
-        <Button type="submit" isLoading={createApiKeyMutation.isPending}>
-          Create
-        </Button>
-      </form>
-    </div>
-  );
-}

apps/web/src/views/settings/components/NewApiKeyModal.tsx

@@ -1,181 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { t } from "@lingui/core/macro";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import {
-  HiInformationCircle,
-  HiMiniCheck,
-  HiOutlineDocumentDuplicate,
-  HiXMark,
-} from "react-icons/hi2";
-import { z } from "zod";
-
-import { authClient } from "@kan/auth/client";
-
-import Button from "~/components/Button";
-import Input from "~/components/Input";
-import { useClipboard } from "~/hooks/useClipboard";
-import { useModal } from "~/providers/modal";
-
-const newApiKeySchema = z.object({
-  name: z
-    .string()
-    .min(1, { message: t`API key name is required` })
-    .max(30, { message: t`API key name cannot exceed 30 characters` }),
-});
-
-export default function NewApiKeyModal() {
-  const { closeModal } = useModal();
-  const { copied, copy } = useClipboard({ timeout: 2000 });
-  const [createdApiKey, setCreatedApiKey] = useState<{
-    key: string;
-    name: string;
-  } | null>(null);
-
-  const {
-    register,
-    handleSubmit,
-    reset,
-    formState: { errors },
-  } = useForm<z.infer<typeof newApiKeySchema>>({
-    resolver: zodResolver(newApiKeySchema),
-    defaultValues: {
-      name: "",
-    },
-  });
-
-  const qc = useQueryClient();
-
-  const createApiKeyMutation = useMutation({
-    mutationFn: ({ name }: { name: string }) =>
-      authClient.apiKey.create({ name, prefix: "kan_" }),
-    onSuccess: ({ data: apiKey }) => {
-      void qc.invalidateQueries({
-        queryKey: ["apiKeys"],
-      });
-      if (apiKey && apiKey.key && apiKey.name) {
-        setCreatedApiKey({
-          key: apiKey.key,
-          name: apiKey.name,
-        });
-      }
-    },
-    onError: () => {
-      // Handle error if needed
-    },
-  });
-
-  const onSubmit = (data: z.infer<typeof newApiKeySchema>) => {
-    createApiKeyMutation.mutate({ name: data.name });
-  };
-
-  useEffect(() => {
-    // Reset state and form when modal opens
-    setCreatedApiKey(null);
-    reset();
-  }, [reset]);
-
-  useEffect(() => {
-    if (!createdApiKey) {
-      const nameElement = document.querySelector<HTMLElement>("#name");
-      if (nameElement) nameElement.focus();
-    }
-  }, [createdApiKey]);
-
-  if (createdApiKey) {
-    return (
-      <div>
-        <div className="px-5 pt-5">
-          <div className="flex w-full items-center justify-between pb-4 text-neutral-900 dark:text-dark-1000">
-            <h2 className="text-sm font-bold">{t`API key created`}</h2>
-            <button
-              type="button"
-              className="rounded p-1 hover:bg-light-300 focus:outline-none dark:hover:bg-dark-300"
-              onClick={(e) => {
-                e.preventDefault();
-                closeModal();
-              }}
-            >
-              <HiXMark
-                size={18}
-                className="text-light-900 dark:text-dark-900"
-              />
-            </button>
-          </div>
-
-          <div className="mb-4">
-            <div className="relative">
-              <Input
-                value={createdApiKey.key}
-                className="pr-10 text-sm text-light-900 dark:text-dark-900"
-                readOnly
-              />
-              <button
-                type="button"
-                className="absolute inset-y-0 right-0 flex items-center pr-3 text-light-900 hover:text-light-950 dark:text-dark-900 dark:hover:text-dark-950"
-                onClick={() => copy(createdApiKey.key)}
-              >
-                {copied ? (
-                  <HiMiniCheck className="h-5 w-5 text-green-600" />
-                ) : (
-                  <HiOutlineDocumentDuplicate className="h-5 w-5" />
-                )}
-              </button>
-            </div>
-            <div className="mt-2 flex items-start gap-1">
-              <HiInformationCircle className="mt-0.5 h-4 w-4 text-dark-900" />
-              <p className="text-xs text-gray-500 dark:text-dark-900">
-                {t`This API key will only be shown once. Please save it in a secure location.`}
-              </p>
-            </div>
-          </div>
-        </div>
-        <div className="mt-12 flex items-center justify-end border-t border-light-600 px-5 pb-5 pt-5 dark:border-dark-600">
-          <div>
-            <Button onClick={() => closeModal()}>{t`Close`}</Button>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <form onSubmit={handleSubmit(onSubmit)}>
-      <div className="px-5 pt-5">
-        <div className="flex w-full items-center justify-between pb-4 text-neutral-900 dark:text-dark-1000">
-          <h2 className="text-sm font-bold">{t`New API key`}</h2>
-          <button
-            type="button"
-            className="rounded p-1 hover:bg-light-300 focus:outline-none dark:hover:bg-dark-300"
-            onClick={(e) => {
-              e.preventDefault();
-              closeModal();
-            }}
-          >
-            <HiXMark size={18} className="text-light-900 dark:text-dark-900" />
-          </button>
-        </div>
-        <Input
-          id="name"
-          placeholder={t`API key name`}
-          {...register("name", { required: true })}
-          errorMessage={errors.name?.message}
-          onKeyDown={async (e) => {
-            if (e.key === "Enter") {
-              e.preventDefault();
-              await handleSubmit(onSubmit)();
-            }
-          }}
-        />
-      </div>
-      <div className="mt-12 flex items-center justify-end border-t border-light-600 px-5 pb-5 pt-5 dark:border-dark-600">
-        <div>
-          <Button type="submit" isLoading={createApiKeyMutation.isPending}>
-            {t`Create API key`}
-          </Button>
-        </div>
-      </div>
-    </form>
-  );
-}

apps/web/src/views/settings/components/RevokeApiKeyConfirmation.tsx

@@ -1,96 +0,0 @@
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { useState } from "react";
-
-import { authClient } from "@kan/auth/client";
-
-import Button from "~/components/Button";
-import { useModal } from "~/providers/modal";
-import { usePopup } from "~/providers/popup";
-
-export function RevokeApiKeyConfirmation() {
-  const { closeModal, entityId, entityLabel } = useModal();
-  const { showPopup } = usePopup();
-  const qc = useQueryClient();
-
-  const [isAcknowledgmentChecked, setIsAcknowledgmentChecked] = useState(false);
-
-  const deleteApiKeyMutation = useMutation({
-    mutationFn: () => authClient.apiKey.delete({ keyId: entityId }),
-    onSuccess: async () => {
-      closeModal();
-      showPopup({
-        header: "API key revoked",
-        message: `Your API key: ${entityLabel} has been revoked.`,
-        icon: "success",
-      });
-      qc.invalidateQueries({
-        queryKey: ["apiKeys"],
-      });
-    },
-    onError: () => {
-      closeModal();
-      showPopup({
-        header: "Error revoking API key",
-        message: "Please try again later, or contact customer support.",
-        icon: "error",
-      });
-    },
-  });
-
-  const handleRevokeApiKey = () => {
-    deleteApiKeyMutation.mutate();
-  };
-
-  return (
-    <div className="p-5">
-      <div className="flex w-full flex-col justify-between pb-4">
-        <h2 className="text-md pb-4 font-medium text-neutral-900 dark:text-dark-1000">
-          {`Are you sure you want to revoke this API key: ${entityLabel}?`}
-        </h2>
-        <p className="mb-4 text-sm text-light-900 dark:text-dark-900">
-          Keep in mind that this action is irreversible.
-        </p>
-        <p className="text-sm text-light-900 dark:text-dark-900">
-          This will result in the permanent revocation of this API key.
-        </p>
-      </div>
-      <div className="relative flex items-start">
-        <div className="flex h-6 items-center">
-          <input
-            id="acknowledgment"
-            name="acknowledgment"
-            type="checkbox"
-            aria-describedby="acknowledgment-description"
-            className="mt-2 h-[14px] w-[14px] rounded border-gray-300 bg-transparent text-indigo-600 focus:shadow-none focus:ring-0 focus:ring-offset-0"
-            checked={isAcknowledgmentChecked}
-            onChange={() =>
-              setIsAcknowledgmentChecked(!isAcknowledgmentChecked)
-            }
-          />
-        </div>
-        <div className="ml-3 text-sm leading-6">
-          <p
-            id="comments-description"
-            className="text-light-900 dark:text-dark-1000"
-          >
-            I acknowledge that this API key will be permanently revoked and want
-            to proceed.
-          </p>
-        </div>
-      </div>
-      <div className="mt-5 flex justify-end space-x-2 sm:mt-6">
-        <Button variant="secondary" onClick={() => closeModal()}>
-          Cancel
-        </Button>
-        <Button
-          variant="danger"
-          onClick={handleRevokeApiKey}
-          disabled={!isAcknowledgmentChecked}
-          isLoading={deleteApiKeyMutation.isPending}
-        >
-          Revoke API key
-        </Button>
-      </div>
-    </div>
-  );
-}

apps/web/src/views/settings/components/UpdateDisplayNameForm.tsx

@@ -69,18 +69,16 @@ const UpdateDisplayNameForm = ({ displayName }: { displayName: string }) => {
       <div className="mb-4 flex w-full max-w-[325px] items-center gap-2">
         <Input {...register("name")} errorMessage={errors.name?.message} />
       </div>
-      {isDirty && (
-        <div>
-          <Button
-            onClick={handleSubmit(onSubmit)}
-            variant="primary"
-            disabled={updateDisplayName.isPending}
-            isLoading={updateDisplayName.isPending}
-          >
-            {t`Update`}
-          </Button>
-        </div>
-      )}
+      <div>
+        <Button
+          onClick={handleSubmit(onSubmit)}
+          variant="primary"
+          disabled={!isDirty || updateDisplayName.isPending}
+          isLoading={updateDisplayName.isPending}
+        >
+          {t`Update`}
+        </Button>
+      </div>
     </div>
   );
 };

apps/web/src/views/settings/components/UpdateWorkspaceDescriptionForm.tsx

@@ -80,18 +80,16 @@ const UpdateWorkspaceDescriptionForm = ({
           errorMessage={errors.description?.message}
         />
       </div>
-      {isDirty && (
-        <div>
-          <Button
-            onClick={handleSubmit(onSubmit)}
-            variant="primary"
-            disabled={updateWorkspaceDescription.isPending}
-            isLoading={updateWorkspaceDescription.isPending}
-          >
-            {t`Update`}
-          </Button>
-        </div>
-      )}
+      <div>
+        <Button
+          onClick={handleSubmit(onSubmit)}
+          variant="primary"
+          disabled={!isDirty || updateWorkspaceDescription.isPending}
+          isLoading={updateWorkspaceDescription.isPending}
+        >
+          {t`Update`}
+        </Button>
+      </div>
     </div>
   );
 };

apps/web/src/views/settings/components/UpdateWorkspaceNameForm.tsx

@@ -72,18 +72,16 @@ const UpdateWorkspaceNameForm = ({
       <div className="mb-4 flex w-full max-w-[325px] items-center gap-2">
         <Input {...register("name")} errorMessage={errors.name?.message} />
       </div>
-      {isDirty && (
-        <div>
-          <Button
-            onClick={handleSubmit(onSubmit)}
-            variant="primary"
-            disabled={updateWorkspaceName.isPending}
-            isLoading={updateWorkspaceName.isPending}
-          >
-            {t`Update`}
-          </Button>
-        </div>
-      )}
+      <div>
+        <Button
+          onClick={handleSubmit(onSubmit)}
+          variant="primary"
+          disabled={!isDirty || updateWorkspaceName.isPending}
+          isLoading={updateWorkspaceName.isPending}
+        >
+          {t`Update`}
+        </Button>
+      </div>
     </div>
   );
 };

apps/web/src/views/settings/components/UpdateWorkspaceUrlForm.tsx

@@ -98,7 +98,7 @@ const UpdateWorkspaceUrlForm = ({
     if (!isWorkspaceSlugAvailable?.isAvailable) return;
 
     if (workspacePlan !== "pro" && env("NEXT_PUBLIC_KAN_ENV") === "cloud")
-      return openModal("UPGRADE_TO_PRO", data.slug);
+      return openModal("UPDATE_WORKSPACE_URL", data.slug);
 
     updateWorkspaceSlug.mutate({
       workspacePublicId,
@@ -138,23 +138,22 @@ const UpdateWorkspaceUrlForm = ({
           }
         />
       </div>
-      {isDirty && (
-        <div>
-          <Button
-            onClick={handleSubmit(onSubmit)}
-            variant="primary"
-            disabled={
-              updateWorkspaceSlug.isPending ||
-              checkWorkspaceSlugAvailability.isPending ||
-              isWorkspaceSlugAvailable?.isAvailable === false ||
-              isTyping
-            }
-            isLoading={updateWorkspaceSlug.isPending}
-          >
-            {t`Update`}
-          </Button>
-        </div>
-      )}
+      <div>
+        <Button
+          onClick={handleSubmit(onSubmit)}
+          variant="primary"
+          disabled={
+            !isDirty ||
+            updateWorkspaceSlug.isPending ||
+            checkWorkspaceSlugAvailability.isPending ||
+            isWorkspaceSlugAvailable?.isAvailable === false ||
+            isTyping
+          }
+          isLoading={updateWorkspaceSlug.isPending}
+        >
+          {t`Update`}
+        </Button>
+      </div>
     </div>
   );
 };

apps/web/src/views/settings/components/UpgradeToProConfirmation.tsx

@@ -1,113 +0,0 @@
-import { t } from "@lingui/core/macro";
-import { HiBolt, HiCheckBadge } from "react-icons/hi2";
-
-import Button from "~/components/Button";
-import { useModal } from "~/providers/modal";
-import { usePopup } from "~/providers/popup";
-
-export function UpgradeToProConfirmation({
-  workspacePublicId,
-}: {
-  userId: string;
-  workspacePublicId: string;
-}) {
-  const { closeModal, entityId } = useModal();
-  const { showPopup } = usePopup();
-
-  const handleUpgrade = async () => {
-    try {
-      const response = await fetch("/api/stripe/create_checkout_session", {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          ...(entityId && { slug: entityId }),
-          workspacePublicId: workspacePublicId,
-          cancelUrl: "/settings",
-          successUrl: "/settings",
-        }),
-      });
-
-      const { url } = (await response.json()) as { url: string };
-
-      if (url) {
-        window.location.href = url;
-      }
-    } catch (error) {
-      console.error("Error creating checkout session:", error);
-
-      showPopup({
-        header: t`Error upgrading subscription`,
-        message: t`Please try again later, or contact customer support.`,
-        icon: "error",
-      });
-    }
-  };
-
-  return (
-    <div className="p-5">
-      <div className="flex w-full flex-col justify-between pb-4">
-        <h2 className="text-md pb-4 font-bold text-neutral-900 dark:text-dark-1000">
-          {t`Upgrade to Pro`}
-        </h2>
-        <p className="mb-4 text-sm font-medium text-light-900 dark:text-dark-900">
-          {t`Supercharge your workspace for just $29/month. Here's what you'll get:`}
-        </p>
-
-        <div className="rounded-md bg-light-100 p-3 text-xs text-light-900 dark:bg-dark-200 dark:text-dark-900">
-          <div className="space-y-3">
-            <div className="flex items-center space-x-3">
-              <HiCheckBadge className="h-5 w-5 flex-shrink-0 text-light-1000 dark:text-dark-950" />
-              <div className="flex items-center space-x-2">
-                <span className="text-sm text-neutral-900 dark:text-dark-1000">
-                  {t`Unlimited members`}
-                </span>
-                <span className="inline-flex items-center rounded-full bg-emerald-500/10 px-2 py-0.5 text-[10px] font-medium text-emerald-600 ring-1 ring-inset ring-emerald-500/20 dark:text-emerald-400 sm:text-[10px]">
-                  {t`Launch offer`}
-                </span>
-              </div>
-            </div>
-            <div className="flex items-center space-x-3">
-              <HiCheckBadge className="h-5 w-5 flex-shrink-0 text-light-1000 dark:text-dark-950" />
-              <span className="text-sm text-neutral-900 dark:text-dark-1000">
-                {t`Custom workspace URL`}
-              </span>
-            </div>
-            <div className="flex items-center space-x-3">
-              <HiCheckBadge className="h-5 w-5 flex-shrink-0 text-light-1000 dark:text-dark-950" />
-              <div className="flex items-center space-x-2">
-                <span className="text-xs text-neutral-900 dark:text-dark-1000">
-                  {t`Board analytics`}
-                </span>
-                <span className="inline-flex items-center rounded-full bg-gray-500/10 px-2 py-0.5 text-[10px] font-medium text-gray-600 ring-1 ring-inset ring-gray-500/20 dark:text-gray-400 sm:text-[10px]">
-                  {t`Coming soon`}
-                </span>
-              </div>
-            </div>
-            <div className="flex items-center space-x-3">
-              <HiCheckBadge className="h-5 w-5 flex-shrink-0 text-light-1000 dark:text-dark-950" />
-              <span className="text-sm text-neutral-900 dark:text-dark-1000">
-                {t`Priority email support`}
-              </span>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div className="mt-5 flex justify-end space-x-2 sm:mt-6">
-        <Button
-          onClick={() => {
-            closeModal();
-          }}
-          variant="secondary"
-        >
-          {t`Cancel`}
-        </Button>
-        <Button
-          onClick={handleUpgrade}
-          iconRight={<HiBolt />}
-        >{t`Upgrade`}</Button>
-      </div>
-    </div>
-  );
-}

apps/web/src/views/settings/index.tsx

@@ -0,0 +1,372 @@
+import { useRouter } from "next/router";
+import { t } from "@lingui/core/macro";
+import { env } from "next-runtime-env";
+import { useEffect, useRef } from "react";
+import { HiMiniArrowTopRightOnSquare } from "react-icons/hi2";
+
+import Button from "~/components/Button";
+import FeedbackModal from "~/components/FeedbackModal";
+import { LanguageSelector } from "~/components/LanguageSelector";
+import Modal from "~/components/modal";
+import { NewWorkspaceForm } from "~/components/NewWorkspaceForm";
+import { PageHead } from "~/components/PageHead";
+import { useModal } from "~/providers/modal";
+import { usePopup } from "~/providers/popup";
+import { useWorkspace } from "~/providers/workspace";
+import { api } from "~/utils/api";
+import Avatar from "./components/Avatar";
+import { ChangePasswordFormConfirmation } from "./components/ChangePasswordConfirmation";
+import CreateAPIKeyForm from "./components/CreateAPIKeyForm";
+import { CustomURLConfirmation } from "./components/CustomURLConfirmation";
+import { DeleteAccountConfirmation } from "./components/DeleteAccountConfirmation";
+import { DeleteWorkspaceConfirmation } from "./components/DeleteWorkspaceConfirmation";
+import UpdateDisplayNameForm from "./components/UpdateDisplayNameForm";
+import UpdateWorkspaceDescriptionForm from "./components/UpdateWorkspaceDescriptionForm";
+import UpdateWorkspaceNameForm from "./components/UpdateWorkspaceNameForm";
+import UpdateWorkspaceUrlForm from "./components/UpdateWorkspaceUrlForm";
+
+export default function SettingsPage() {
+  const { modalContentType, openModal, isOpen } = useModal();
+  const { workspace } = useWorkspace();
+  const utils = api.useUtils();
+  const { showPopup } = usePopup();
+  const router = useRouter();
+  const workspaceUrlSectionRef = useRef<HTMLDivElement>(null);
+  const scrollContainerRef = useRef<HTMLDivElement>(null);
+  const isCredentialsEnabled =
+    env("NEXT_PUBLIC_ALLOW_CREDENTIALS")?.toLowerCase() === "true";
+  const { data } = api.user.getUser.useQuery();
+
+  const {
+    data: integrations,
+    refetch: refetchIntegrations,
+    isLoading: integrationsLoading,
+  } = api.integration.providers.useQuery();
+
+  const { data: trelloUrl, refetch: refetchTrelloUrl } =
+    api.integration.getAuthorizationUrl.useQuery(
+      { provider: "trello" },
+      {
+        enabled:
+          !integrationsLoading &&
+          !integrations?.some(
+            (integration) => integration.provider === "trello",
+          ),
+        refetchOnWindowFocus: true,
+      },
+    );
+
+  useEffect(() => {
+    const handleFocus = () => {
+      refetchIntegrations();
+    };
+    window.addEventListener("focus", handleFocus);
+    return () => {
+      window.removeEventListener("focus", handleFocus);
+    };
+  }, [refetchIntegrations]);
+
+  useEffect(() => {
+    if (
+      router.query.edit === "workspace_url" &&
+      workspaceUrlSectionRef.current &&
+      scrollContainerRef.current
+    ) {
+      const element = workspaceUrlSectionRef.current;
+      const container = scrollContainerRef.current;
+
+      container.scrollTop = element.offsetTop - 40;
+
+      const input = element.querySelector('input[type="text"]');
+      if (input instanceof HTMLInputElement) {
+        input.focus();
+      }
+    }
+  }, [router.query.edit]);
+
+  const { mutateAsync: disconnectTrello } =
+    api.integration.disconnect.useMutation({
+      onSuccess: () => {
+        refetchUser();
+        refetchIntegrations();
+        refetchTrelloUrl();
+        showPopup({
+          header: t`Trello disconnected`,
+          message: t`Your Trello account has been disconnected.`,
+          icon: "success",
+        });
+      },
+      onError: () => {
+        showPopup({
+          header: t`Error disconnecting Trello`,
+          message: t`An error occurred while disconnecting your Trello account.`,
+          icon: "error",
+        });
+      },
+    });
+
+  const refetchUser = () => utils.user.getUser.refetch();
+
+  const handleOpenBillingPortal = async () => {
+    try {
+      const response = await fetch("/api/stripe/create_billing_session", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+      });
+
+      const { url } = (await response.json()) as { url: string };
+
+      if (url) {
+        window.location.href = url;
+      }
+    } catch (error) {
+      console.error("Error creating billing session:", error);
+    }
+  };
+
+  return (
+    <>
+      <div className="flex h-full w-full flex-col overflow-hidden">
+        <div
+          ref={scrollContainerRef}
+          className="h-full max-h-[calc(100vdh-3rem)] overflow-y-auto md:max-h-[calc(100vdh-4rem)]"
+        >
+          <PageHead title={t`Settings | ${workspace.name ?? "Workspace"}`} />
+          <div className="m-auto max-w-[1100px] px-5 py-6 md:px-28 md:py-12">
+            <div className="mb-8 flex w-full justify-between">
+              <h1 className="font-bold tracking-tight text-neutral-900 dark:text-dark-1000 sm:text-[1.2rem]">
+                {t`Settings`}
+              </h1>
+            </div>
+
+            <div className="mb-8 border-t border-light-300 dark:border-dark-300">
+              <h2 className="mb-4 mt-8 text-[14px] text-neutral-900 dark:text-dark-1000">
+                {t`Profile picture`}
+              </h2>
+              <Avatar userId={data?.id} userImage={data?.image} />
+
+              <h2 className="mb-4 mt-8 text-[14px] text-neutral-900 dark:text-dark-1000">
+                {t`Display name`}
+              </h2>
+              <UpdateDisplayNameForm displayName={data?.name ?? ""} />
+            </div>
+
+            <div className="mb-8 border-t border-light-300 dark:border-dark-300">
+              <h2 className="mb-4 mt-8 text-[14px] text-neutral-900 dark:text-dark-1000">
+                {t`Workspace name`}
+              </h2>
+              <UpdateWorkspaceNameForm
+                workspacePublicId={workspace.publicId}
+                workspaceName={workspace.name}
+              />
+
+              <div ref={workspaceUrlSectionRef}>
+                <h2 className="mb-4 mt-8 text-[14px] text-neutral-900 dark:text-dark-1000">
+                  {t`Workspace URL`}
+                </h2>
+                <UpdateWorkspaceUrlForm
+                  workspacePublicId={workspace.publicId}
+                  workspaceUrl={workspace.slug ?? ""}
+                  workspacePlan={workspace.plan ?? "free"}
+                />
+              </div>
+
+              <h2 className="mb-4 mt-8 text-[14px] text-neutral-900 dark:text-dark-1000">
+                {t`Workspace description`}
+              </h2>
+              <UpdateWorkspaceDescriptionForm
+                workspacePublicId={workspace.publicId}
+                workspaceDescription={workspace.description ?? ""}
+              />
+            </div>
+
+            <div className="mb-8 border-t border-light-300 dark:border-dark-300">
+              <h2 className="mb-4 mt-8 text-[14px] text-neutral-900 dark:text-dark-1000">
+                {t`Language`}
+              </h2>
+              <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
+                {t`Change the language of the app.`}
+              </p>
+              <LanguageSelector />
+            </div>
+
+            {env("NEXT_PUBLIC_KAN_ENV") === "cloud" && (
+              <div className="mb-8 border-t border-light-300 dark:border-dark-300">
+                <h2 className="mb-4 mt-8 text-[14px] text-neutral-900 dark:text-dark-1000">
+                  {t`Billing`}
+                </h2>
+                <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
+                  {t`View and manage your billing and subscription.`}
+                </p>
+                <Button
+                  variant="primary"
+                  iconRight={<HiMiniArrowTopRightOnSquare />}
+                  onClick={handleOpenBillingPortal}
+                >
+                  {t`Billing portal`}
+                </Button>
+              </div>
+            )}
+
+            <div className="mb-8 border-t border-light-300 dark:border-dark-300">
+              <h2 className="mb-4 mt-8 text-[14px] text-neutral-900 dark:text-dark-1000">
+                Trello
+              </h2>
+              {!integrations?.some(
+                (integration) => integration.provider === "trello",
+              ) && trelloUrl ? (
+                <>
+                  <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
+                    {t`Connect your Trello account to import boards.`}
+                  </p>
+                  <Button
+                    variant="primary"
+                    iconRight={<HiMiniArrowTopRightOnSquare />}
+                    onClick={() =>
+                      window.open(
+                        trelloUrl.url,
+                        "trello_auth",
+                        "height=800,width=600",
+                      )
+                    }
+                  >
+                    {t`Connect Trello`}
+                  </Button>
+                </>
+              ) : (
+                integrations?.some(
+                  (integration) => integration.provider === "trello",
+                ) && (
+                  <>
+                    <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
+                      {t`Your Trello account is connected.`}
+                    </p>
+                    <Button
+                      variant="secondary"
+                      onClick={() => disconnectTrello({ provider: "trello" })}
+                    >
+                      {t`Disconnect Trello`}
+                    </Button>
+                  </>
+                )
+              )}
+            </div>
+
+            <div className="mb-8 border-t border-light-300 dark:border-dark-300">
+              <h2 className="mb-4 mt-8 text-[14px] text-neutral-900 dark:text-dark-1000">
+                {t`API keys`}
+              </h2>
+              <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
+                {t`View and manage your API keys.`}
+              </p>
+              <CreateAPIKeyForm
+                apiKey={data?.apiKey}
+                refetchUser={refetchUser}
+              />
+            </div>
+
+            <div className="mb-8 border-t border-light-300 dark:border-dark-300">
+              <h2 className="mb-4 mt-8 text-[14px] text-neutral-900 dark:text-dark-1000">
+                {t`Delete workspace`}
+              </h2>
+              <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
+                {t`Once you delete your workspace, there is no going back. This action cannot be undone.`}
+              </p>
+              <div className="mt-4">
+                <Button
+                  variant="secondary"
+                  onClick={() => openModal("DELETE_WORKSPACE")}
+                  disabled={workspace.role !== "admin"}
+                >
+                  {t`Delete workspace`}
+                </Button>
+              </div>
+            </div>
+
+            {isCredentialsEnabled && (
+              <div className="mb-8 border-t border-light-300 dark:border-dark-300">
+                <h2 className="mb-4 mt-8 text-[14px] text-neutral-900 dark:text-dark-1000">
+                  {t`Change Password`}
+                </h2>
+                <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
+                  {t`You are about to change your password.`}
+                </p>
+                <div className="mt-4">
+                  <Button
+                    variant="secondary"
+                    onClick={() => openModal("CHANGE_PASSWORD")}
+                  >
+                    {t`Change Password`}
+                  </Button>
+                </div>
+              </div>
+            )}
+
+            <div className="mb-8 border-t border-light-300 dark:border-dark-300">
+              <h2 className="mb-4 mt-8 text-[14px] text-neutral-900 dark:text-dark-1000">
+                {t`Delete account`}
+              </h2>
+              <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
+                {t`Once you delete your account, there is no going back. This action cannot be undone.`}
+              </p>
+              <div className="mt-4">
+                <Button
+                  variant="secondary"
+                  onClick={() => openModal("DELETE_ACCOUNT")}
+                >
+                  {t`Delete account`}
+                </Button>
+              </div>
+            </div>
+          </div>
+
+          <>
+            <Modal
+              modalSize="md"
+              isVisible={isOpen && modalContentType === "NEW_FEEDBACK"}
+            >
+              <FeedbackModal />
+            </Modal>
+
+            <Modal
+              modalSize="sm"
+              isVisible={isOpen && modalContentType === "NEW_WORKSPACE"}
+            >
+              <NewWorkspaceForm />
+            </Modal>
+
+            <Modal
+              modalSize="sm"
+              isVisible={isOpen && modalContentType === "DELETE_WORKSPACE"}
+            >
+              <DeleteWorkspaceConfirmation />
+            </Modal>
+
+            <Modal
+              modalSize="sm"
+              isVisible={isOpen && modalContentType === "UPDATE_WORKSPACE_URL"}
+            >
+              <CustomURLConfirmation workspacePublicId={workspace.publicId} />
+            </Modal>
+
+            <Modal
+              modalSize="sm"
+              isVisible={isOpen && modalContentType === "DELETE_ACCOUNT"}
+            >
+              <DeleteAccountConfirmation />
+            </Modal>
+
+            <Modal
+              modalSize="sm"
+              isVisible={isOpen && modalContentType === "CHANGE_PASSWORD"}
+            >
+              <ChangePasswordFormConfirmation />
+            </Modal>
+          </>
+        </div>
+      </div>
+    </>
+  );
+}

cloud/docker-compose.yml

@@ -22,11 +22,6 @@ services:
       # Stripe
       - STRIPE_SECRET_KEY=${STRIPE_SECRET_KEY}
       - STRIPE_WEBHOOK_SECRET=${STRIPE_WEBHOOK_SECRET}
-      - STRIPE_WEBHOOK_SECRET_LEGACY=${STRIPE_WEBHOOK_SECRET_LEGACY}
-      - STRIPE_TEAM_PLAN_MONTHLY_PRICE_ID=${STRIPE_TEAM_PLAN_MONTHLY_PRICE_ID}
-      - STRIPE_TEAM_PLAN_YEARLY_PRICE_ID=${STRIPE_TEAM_PLAN_YEARLY_PRICE_ID}
-      - STRIPE_PRO_PLAN_MONTHLY_PRICE_ID=${STRIPE_PRO_PLAN_MONTHLY_PRICE_ID}
-      - STRIPE_PRO_PLAN_YEARLY_PRICE_ID=${STRIPE_PRO_PLAN_YEARLY_PRICE_ID}
 
       # Email
       - SMTP_HOST=${SMTP_HOST}

packages/api/src/routers/member.ts

@@ -2,10 +2,8 @@ import { TRPCError } from "@trpc/server";
 import { z } from "zod";
 
 import * as memberRepo from "@kan/db/repository/member.repo";
-import * as subscriptionRepo from "@kan/db/repository/subscription.repo";
 import * as userRepo from "@kan/db/repository/user.repo";
 import * as workspaceRepo from "@kan/db/repository/workspace.repo";
-import { getSubscriptionByPlan, hasUnlimitedSeats } from "@kan/shared/utils";
 import { updateSubscriptionSeats } from "@kan/stripe";
 
 import { createTRPCRouter, protectedProcedure } from "../trpc";
@@ -64,34 +62,29 @@ export const memberRouter = createTRPCRouter({
       }
 
       if (process.env.NEXT_PUBLIC_KAN_ENV === "cloud") {
-        const subscriptions = await subscriptionRepo.getByReferenceId(
-          ctx.db,
-          workspace.publicId,
+        const subscriptions = await ctx.auth.api.listActiveSubscriptions({
+          workspacePublicId: workspace.publicId,
+        });
+
+        // get the active subscription
+        const activeSubscription = subscriptions.find(
+          (sub) =>
+            sub.status === "active" ||
+            (sub.status === "trialing" && sub.plan === "team"),
         );
 
-        // get the active subscriptions
-        const activeTeamSubscription = getSubscriptionByPlan(
-          subscriptions,
-          "team",
-        );
-        const activeProSubscription = getSubscriptionByPlan(
-          subscriptions,
-          "pro",
-        );
-        const unlimitedSeats = hasUnlimitedSeats(subscriptions);
-
-        if (!activeTeamSubscription && !activeProSubscription) {
+        if (!activeSubscription) {
           throw new TRPCError({
             message: `Workspace with public ID ${workspace.publicId} does not have an active subscription`,
             code: "NOT_FOUND",
           });
         }
 
-        // Update the Stripe subscription
-        if (activeTeamSubscription?.stripeSubscriptionId && !unlimitedSeats) {
+        // Update the Stripe subscription to add a seat with immediate proration
+        if (activeSubscription.stripeSubscriptionId) {
           try {
             await updateSubscriptionSeats(
-              activeTeamSubscription.stripeSubscriptionId,
+              activeSubscription.stripeSubscriptionId,
               1,
             );
           } catch (error) {
@@ -211,23 +204,22 @@ export const memberRouter = createTRPCRouter({
 
       // Handle subscription seat decrement for cloud environment
       if (process.env.NEXT_PUBLIC_KAN_ENV === "cloud") {
-        const subscriptions = await subscriptionRepo.getByReferenceId(
-          ctx.db,
-          workspace.publicId,
-        );
+        const subscriptions = await ctx.auth.api.listActiveSubscriptions({
+          workspacePublicId: workspace.publicId,
+        });
 
-        // get the active subscriptions
-        const activeTeamSubscription = getSubscriptionByPlan(
-          subscriptions,
-          "team",
+        // get the active subscription
+        const activeSubscription = subscriptions.find(
+          (sub) =>
+            sub.status === "active" ||
+            (sub.status === "trialing" && sub.plan === "team"),
         );
-        const unlimitedSeats = hasUnlimitedSeats(subscriptions);
 
         // Only decrease seats if there's an active subscription and stripeSubscriptionId
-        if (activeTeamSubscription?.stripeSubscriptionId && !unlimitedSeats) {
+        if (activeSubscription?.stripeSubscriptionId) {
           try {
             await updateSubscriptionSeats(
-              activeTeamSubscription.stripeSubscriptionId,
+              activeSubscription.stripeSubscriptionId,
               -1,
             );
           } catch (error) {

packages/api/src/routers/workspace.ts

@@ -140,12 +140,6 @@ export const workspaceRouter = createTRPCRouter({
     .input(
       z.object({
         name: z.string().min(1),
-        slug: z
-          .string()
-          .min(3)
-          .max(24)
-          .regex(/^(?![-]+$)[a-zA-Z0-9-]+$/)
-          .optional(),
       }),
     )
     .output(z.custom<Awaited<ReturnType<typeof workspaceRepo.create>>>())
@@ -159,43 +153,12 @@ export const workspaceRouter = createTRPCRouter({
           code: "UNAUTHORIZED",
         });
 
-      // Check if slug is provided in cloud environment
-      if (input.slug && env("NEXT_PUBLIC_KAN_ENV") === "cloud") {
-        throw new TRPCError({
-          message: "Custom URLs are only available for Pro workspaces",
-          code: "BAD_REQUEST",
-        });
-      }
-
       const workspacePublicId = generateUID();
-      const workspaceSlug = input.slug ?? workspacePublicId;
-
-      if (input.slug) {
-        const reservedOrPremiumWorkspaceSlug =
-          await workspaceSlugRepo.getWorkspaceSlug(ctx.db, input.slug);
-
-        const isWorkspaceSlugAvailable =
-          await workspaceRepo.isWorkspaceSlugAvailable(ctx.db, input.slug);
-
-        if (reservedOrPremiumWorkspaceSlug) {
-          throw new TRPCError({
-            message: `Workspace slug '${input.slug}' is reserved or premium`,
-            code: "BAD_REQUEST",
-          });
-        }
-
-        if (!isWorkspaceSlugAvailable) {
-          throw new TRPCError({
-            message: `Workspace slug '${input.slug}' is already taken`,
-            code: "BAD_REQUEST",
-          });
-        }
-      }
 
       const result = await workspaceRepo.create(ctx.db, {
         publicId: workspacePublicId,
         name: input.name,
-        slug: workspaceSlug,
+        slug: workspacePublicId,
         createdBy: userId,
         createdByEmail: userEmail,
       });
@@ -371,14 +334,6 @@ export const workspaceRouter = createTRPCRouter({
       }),
     )
     .query(async ({ ctx, input }) => {
-      const userId = ctx.user?.id;
-
-      if (!userId)
-        throw new TRPCError({
-          message: `User not authenticated`,
-          code: "UNAUTHORIZED",
-        });
-
       const slug = input.workspaceSlug.toLowerCase();
       // check slug is not reserved
       const workspaceSlug = await workspaceSlugRepo.getWorkspaceSlug(
@@ -390,19 +345,6 @@ export const workspaceRouter = createTRPCRouter({
       const isWorkspaceSlugAvailable =
         await workspaceRepo.isWorkspaceSlugAvailable(ctx.db, slug);
 
-      const isAvailable =
-        isWorkspaceSlugAvailable && workspaceSlug?.type !== "reserved";
-      const isReserved = workspaceSlug?.type === "reserved";
-
-      if (env("NEXT_PUBLIC_KAN_ENV") === "cloud") {
-        await workspaceSlugRepo.createWorkspaceSlugCheck(ctx.db, {
-          slug,
-          userId,
-          available: isAvailable,
-          reserved: isReserved,
-        });
-      }
-
       return {
         isAvailable:
           isWorkspaceSlugAvailable && workspaceSlug?.type !== "reserved",

packages/auth/src/auth.ts

@@ -10,7 +10,6 @@ import { env } from "next-runtime-env";
 
 import type { dbClient } from "@kan/db/client";
 import * as memberRepo from "@kan/db/repository/member.repo";
-import * as subscriptionRepo from "@kan/db/repository/subscription.repo";
 import * as userRepo from "@kan/db/repository/user.repo";
 import * as workspaceRepo from "@kan/db/repository/workspace.repo";
 import * as schema from "@kan/db/schema";
@@ -115,13 +114,13 @@ async function downloadImage(url: string): Promise<Buffer> {
 export const initAuth = (db: dbClient) => {
   return betterAuth({
     secret: process.env.BETTER_AUTH_SECRET!,
-    baseURL: env("NEXT_PUBLIC_BASE_URL"),
+    baseURL: process.env.NEXT_PUBLIC_BASE_URL!,
     trustedOrigins: process.env.BETTER_AUTH_TRUSTED_ORIGINS
       ? [
-          env("NEXT_PUBLIC_BASE_URL") ?? "",
+          process.env.NEXT_PUBLIC_BASE_URL!,
           ...process.env.BETTER_AUTH_TRUSTED_ORIGINS.split(","),
         ]
-      : [env("NEXT_PUBLIC_BASE_URL") ?? ""],
+      : [process.env.NEXT_PUBLIC_BASE_URL!],
     database: drizzleAdapter(db, {
       provider: "pg",
       schema: {
@@ -197,44 +196,6 @@ export const initAuth = (db: dbClient) => {
 
                   return isUserInWorkspace;
                 },
-                getCheckoutSessionParams: () => {
-                  return {
-                    params: {
-                      allow_promotion_codes: true,
-                    },
-                  };
-                },
-                onSubscriptionComplete: async ({
-                  subscription,
-                  stripeSubscription,
-                }) => {
-                  // Set unlimited seats to true for pro plans
-                  if (subscription.plan === "pro") {
-                    await subscriptionRepo.updateByStripeSubscriptionId(
-                      db,
-                      stripeSubscription.id,
-                      {
-                        unlimitedSeats: true,
-                      },
-                    );
-                    console.log(
-                      `Pro subscription ${stripeSubscription.id} activated with unlimited seats`,
-                    );
-
-                    const workspace = await workspaceRepo.getByPublicId(
-                      db,
-                      subscription.referenceId,
-                    );
-
-                    if (workspace?.id) {
-                      await memberRepo.unpauseAllMembers(db, workspace.id);
-
-                      console.log(
-                        `Unpausing all members for workspace ${workspace.id}`,
-                      );
-                    }
-                  }
-                },
               },
             }),
           ]
@@ -356,17 +317,37 @@ export const initAuth = (db: dbClient) => {
     },
     hooks: {
       after: createAuthMiddleware(async (ctx) => {
-        if (
+        if (ctx.path.startsWith("/get-session")) {
+          const user = ctx.context.session?.user;
+
+          if (
+            env("NEXT_PUBLIC_KAN_ENV") === "cloud" &&
+            user &&
+            !user.stripeCustomerId
+          ) {
+            const stripe = createStripeClient();
+            const stripeCustomer = await stripe.customers.create({
+              email: user.email,
+              metadata: {
+                userId: user.id,
+              },
+            });
+
+            await userRepo.update(db, user.id, {
+              stripeCustomerId: stripeCustomer.id,
+            });
+          }
+        } else if (
           ctx.path === "/magic-link/verify" &&
           (ctx.query?.callbackURL as string | undefined)?.includes(
             "type=invite",
-          )
+          ) &&
+          ctx.query?.memberPublicId
         ) {
           const userId = ctx.context.newSession?.session.userId;
-          const callbackURL = ctx.query?.callbackURL as string | undefined;
-          const memberPublicId = callbackURL?.split("memberPublicId=")[1];
+          const memberPublicId = ctx.query.memberPublicId as string;
 
-          if (userId && memberPublicId) {
+          if (userId) {
             const member = await memberRepo.getByPublicId(db, memberPublicId);
 
             if (member?.id) {

packages/db/migrations/20250907185512_AddUnlimitedSeatsToSubscription.sql

@@ -1 +0,0 @@
-ALTER TABLE "subscription" ADD COLUMN "unlimitedSeats" boolean DEFAULT false NOT NULL;

packages/db/migrations/20250910195058_RemoveNotNullConstraintFromReferenceIdOnSubsriptions.sql

@@ -1 +0,0 @@
-ALTER TABLE "subscription" ALTER COLUMN "referenceId" DROP NOT NULL;

packages/db/migrations/20250910200416_AddWorkspaceSlugChecks.sql

@@ -1,22 +0,0 @@
-CREATE TABLE IF NOT EXISTS "workspace_slug_checks" (
-	"id" bigserial PRIMARY KEY NOT NULL,
-	"slug" varchar(255) NOT NULL,
-	"available" boolean NOT NULL,
-	"reserved" boolean NOT NULL,
-	"workspaceId" bigint,
-	"createdBy" uuid,
-	"createdAt" timestamp DEFAULT now() NOT NULL
-);
---> statement-breakpoint
-ALTER TABLE "workspace_slug_checks" ENABLE ROW LEVEL SECURITY;--> statement-breakpoint
-DO $$ BEGIN
- ALTER TABLE "workspace_slug_checks" ADD CONSTRAINT "workspace_slug_checks_workspaceId_workspace_id_fk" FOREIGN KEY ("workspaceId") REFERENCES "public"."workspace"("id") ON DELETE no action ON UPDATE no action;
-EXCEPTION
- WHEN duplicate_object THEN null;
-END $$;
---> statement-breakpoint
-DO $$ BEGIN
- ALTER TABLE "workspace_slug_checks" ADD CONSTRAINT "workspace_slug_checks_createdBy_user_id_fk" FOREIGN KEY ("createdBy") REFERENCES "public"."user"("id") ON DELETE set null ON UPDATE no action;
-EXCEPTION
- WHEN duplicate_object THEN null;
-END $$;

packages/db/migrations/20250910202358_AddCascadeSetNullToReferenceIdOnSubsriptions.sql

@@ -1,7 +0,0 @@
-ALTER TABLE "subscription" DROP CONSTRAINT "subscription_referenceId_workspace_publicId_fk";
---> statement-breakpoint
-DO $$ BEGIN
- ALTER TABLE "subscription" ADD CONSTRAINT "subscription_referenceId_workspace_publicId_fk" FOREIGN KEY ("referenceId") REFERENCES "public"."workspace"("publicId") ON DELETE set null ON UPDATE no action;
-EXCEPTION
- WHEN duplicate_object THEN null;
-END $$;

packages/db/migrations/20250918201751_AddPausedMemberStatus.sql

@@ -1 +0,0 @@
-ALTER TYPE "public"."member_status" ADD VALUE 'paused';

packages/db/migrations/meta/_journal.json

@@ -71,41 +71,6 @@
       "when": 1756803246096,
       "tag": "20250902085406_AddSubscriptions",
       "breakpoints": true
-    },
-    {
-      "idx": 10,
-      "version": "7",
-      "when": 1757271312974,
-      "tag": "20250907185512_AddUnlimitedSeatsToSubscription",
-      "breakpoints": true
-    },
-    {
-      "idx": 11,
-      "version": "7",
-      "when": 1757533858687,
-      "tag": "20250910195058_RemoveNotNullConstraintFromReferenceIdOnSubsriptions",
-      "breakpoints": true
-    },
-    {
-      "idx": 12,
-      "version": "7",
-      "when": 1757534656098,
-      "tag": "20250910200416_AddWorkspaceSlugChecks",
-      "breakpoints": true
-    },
-    {
-      "idx": 13,
-      "version": "7",
-      "when": 1757535838766,
-      "tag": "20250910202358_AddCascadeSetNullToReferenceIdOnSubsriptions",
-      "breakpoints": true
-    },
-    {
-      "idx": 14,
-      "version": "7",
-      "when": 1758226671081,
-      "tag": "20250918201751_AddPausedMemberStatus",
-      "breakpoints": true
     }
   ]
 }

packages/db/src/repository/list.repo.ts

@@ -59,32 +59,9 @@ export const create = async (
       .having(gt(countExpr, 1));
 
     if (duplicateIndices.length > 0) {
-      // Compact indices to sequential values (0..n-1) to resolve duplicates while preserving order
-      await tx.execute(sql`
-        WITH ordered AS (
-          SELECT id, ROW_NUMBER() OVER (ORDER BY "index", id) - 1 AS new_index
-          FROM "list"
-          WHERE "boardId" = ${result.boardId} AND "deletedAt" IS NULL
-        )
-        UPDATE "list" l
-        SET "index" = o.new_index
-        FROM ordered o
-        WHERE l.id = o.id;
-      `);
-
-      // Last resort: verify fix; if duplicates persist (e.g., due to race conditions), rollback
-      const postFixDupes = await tx
-        .select({ index: lists.index, count: countExpr })
-        .from(lists)
-        .where(and(eq(lists.boardId, result.boardId), isNull(lists.deletedAt)))
-        .groupBy(lists.index)
-        .having(gt(countExpr, 1));
-
-      if (postFixDupes.length > 0) {
-        throw new Error(
-          `Invariant violation: duplicate indices remain after compaction in board ${result.boardId}`,
-        );
-      }
+      throw new Error(
+        `Duplicate indices found after reordering in board ${result.boardId}`,
+      );
     }
 
     return result;
@@ -102,98 +79,7 @@ export const bulkCreate = async (
     importId?: number;
   }[],
 ) => {
-  if (listInput.length === 0) return [];
-
-  return db.transaction(async (tx) => {
-    // Group incoming rows by board to compute safe, sequential indices per board
-    const byBoard = new Map<number, typeof listInput>();
-    for (const item of listInput) {
-      const arr = byBoard.get(item.boardId) ?? [];
-      arr.push(item);
-      byBoard.set(item.boardId, arr);
-    }
-
-    const allValuesToInsert: {
-      publicId: string;
-      name: string;
-      createdBy: string;
-      boardId: number;
-      index: number;
-      importId?: number;
-    }[] = [];
-
-    // For each board, append incoming lists after the current max index, preserving their relative order
-    for (const [boardId, items] of byBoard.entries()) {
-      // Find current max index for non-deleted lists in this board
-      const last = await tx.query.lists.findFirst({
-        columns: { index: true },
-        where: and(eq(lists.boardId, boardId), isNull(lists.deletedAt)),
-        orderBy: [desc(lists.index)],
-      });
-
-      let nextIndex = last ? last.index + 1 : 0;
-
-      // Sort incoming by their provided index to preserve Trello order, then reassign sequential indices
-      const sorted = [...items].sort((a, b) => a.index - b.index);
-      for (const it of sorted) {
-        allValuesToInsert.push({
-          publicId: it.publicId,
-          name: it.name,
-          createdBy: it.createdBy,
-          boardId: it.boardId,
-          index: nextIndex++,
-          importId: it.importId,
-        });
-      }
-    }
-
-    // Insert all rows in one go
-    const inserted = await tx
-      .insert(lists)
-      .values(allValuesToInsert)
-      .returning();
-
-    // Post-insert check: if duplicates exist, compact indices per board instead of failing
-    const countExpr = sql<number>`COUNT(*)`.mapWith(Number);
-    for (const boardId of byBoard.keys()) {
-      const duplicateIndices = await tx
-        .select({ index: lists.index, count: countExpr })
-        .from(lists)
-        .where(and(eq(lists.boardId, boardId), isNull(lists.deletedAt)))
-        .groupBy(lists.index)
-        .having(gt(countExpr, 1));
-
-      if (duplicateIndices.length > 0) {
-        await tx.execute(sql`
-          WITH ordered AS (
-            SELECT id, ROW_NUMBER() OVER (ORDER BY "index", id) - 1 AS new_index
-            FROM "list"
-            WHERE "boardId" = ${boardId} AND "deletedAt" IS NULL
-          )
-          UPDATE "list" l
-          SET "index" = o.new_index
-          FROM ordered o
-          WHERE l.id = o.id;
-        `);
-
-        // Last resort: verify fix; if duplicates persist (e.g., due to race conditions), rollback
-        const postFixDupes = await tx
-          .select({ index: lists.index, count: countExpr })
-          .from(lists)
-          .where(and(eq(lists.boardId, boardId), isNull(lists.deletedAt)))
-          .groupBy(lists.index)
-          .having(gt(countExpr, 1));
-
-        if (postFixDupes.length > 0) {
-          throw new Error(
-            `Invariant violation: duplicate indices remain after compaction in board ${boardId}`,
-          );
-        }
-      }
-    }
-
-    return inserted;
-  });
+  return db.insert(lists).values(listInput).returning();
 };
 
 export const getByPublicId = async (db: dbClient, listPublicId: string) => {
@@ -294,32 +180,9 @@ export const reorder = async (
       .having(gt(countExpr, 1));
 
     if (duplicateIndices.length > 0) {
-      // Attempt to auto-heal by compacting indices to sequential values (0..n-1) while preserving order
-      await tx.execute(sql`
-        WITH ordered AS (
-          SELECT id, ROW_NUMBER() OVER (ORDER BY "index", id) - 1 AS new_index
-          FROM "list"
-          WHERE "boardId" = ${list.boardId} AND "deletedAt" IS NULL
-        )
-        UPDATE "list" l
-        SET "index" = o.new_index
-        FROM ordered o
-        WHERE l.id = o.id;
-      `);
-
-      // Last resort verification: if duplicates persist, rollback
-      const postFixDupes = await tx
-        .select({ index: lists.index, count: countExpr })
-        .from(lists)
-        .where(and(eq(lists.boardId, list.boardId), isNull(lists.deletedAt)))
-        .groupBy(lists.index)
-        .having(gt(countExpr, 1));
-
-      if (postFixDupes.length > 0) {
-        throw new Error(
-          `Invariant violation: duplicate indices remain after compaction in board ${list.boardId}`,
-        );
-      }
+      throw new Error(
+        `Duplicate indices found after reordering in board ${list.boardId}`,
+      );
     }
 
     const updatedList = await tx.query.lists.findFirst({

packages/db/src/repository/member.repo.ts

@@ -95,15 +95,3 @@ export const softDelete = async (
 
   return result;
 };
-
-export const unpauseAllMembers = async (db: dbClient, workspaceId: number) => {
-  await db
-    .update(workspaceMembers)
-    .set({ status: "active" })
-    .where(
-      and(
-        eq(workspaceMembers.workspaceId, workspaceId),
-        eq(workspaceMembers.status, "paused"),
-      ),
-    );
-};

packages/db/src/repository/subscription.repo.ts

@@ -1,91 +0,0 @@
-import { eq } from "drizzle-orm";
-
-import type { dbClient } from "@kan/db/client";
-import { subscription } from "@kan/db/schema";
-
-export const updateById = async (
-  db: dbClient,
-  subscriptionId: number,
-  updates: {
-    unlimitedSeats?: boolean;
-    status?: string;
-    seats?: number | null;
-    periodStart?: Date | null;
-    periodEnd?: Date | null;
-    cancelAtPeriodEnd?: boolean | null;
-  },
-) => {
-  const [result] = await db
-    .update(subscription)
-    .set({
-      ...updates,
-      updatedAt: new Date(),
-    })
-    .where(eq(subscription.id, subscriptionId))
-    .returning({
-      id: subscription.id,
-      plan: subscription.plan,
-      status: subscription.status,
-      unlimitedSeats: subscription.unlimitedSeats,
-    });
-
-  return result;
-};
-
-export const updateByStripeSubscriptionId = async (
-  db: dbClient,
-  stripeSubscriptionId: string,
-  updates: {
-    unlimitedSeats?: boolean;
-    status?: string;
-    seats?: number | null;
-    periodStart?: Date | null;
-    periodEnd?: Date | null;
-    cancelAtPeriodEnd?: boolean | null;
-  },
-) => {
-  const [result] = await db
-    .update(subscription)
-    .set({
-      ...updates,
-      updatedAt: new Date(),
-    })
-    .where(eq(subscription.stripeSubscriptionId, stripeSubscriptionId))
-    .returning({
-      id: subscription.id,
-      plan: subscription.plan,
-      status: subscription.status,
-      unlimitedSeats: subscription.unlimitedSeats,
-    });
-
-  return result;
-};
-
-export const getByStripeSubscriptionId = async (
-  db: dbClient,
-  stripeSubscriptionId: string,
-) => {
-  return await db.query.subscription.findFirst({
-    where: eq(subscription.stripeSubscriptionId, stripeSubscriptionId),
-  });
-};
-
-export const getByReferenceId = async (db: dbClient, referenceId: string) => {
-  return await db.query.subscription.findMany({
-    where: eq(subscription.referenceId, referenceId),
-  });
-};
-
-export const create = async (
-  db: dbClient,
-  data: {
-    plan: string;
-    referenceId: string;
-    userId: string;
-    stripeCustomerId: string;
-    status: string;
-  },
-) => {
-  const [result] = await db.insert(subscription).values(data).returning();
-  return result;
-};

packages/db/src/repository/workspace.repo.ts

@@ -127,7 +127,6 @@ export const getByPublicIdWithMembers = (
           plan: true,
           status: true,
           seats: true,
-          unlimitedSeats: true,
           periodStart: true,
           periodEnd: true,
         },

packages/db/src/repository/workspaceSlug.repo.ts

@@ -1,7 +1,7 @@
 import { eq } from "drizzle-orm";
 
 import type { dbClient } from "@kan/db/client";
-import { slugChecks, slugs } from "@kan/db/schema";
+import { slugs } from "@kan/db/schema";
 
 export const getWorkspaceSlug = (db: dbClient, slug: string) => {
   return db.query.slugs.findFirst({
@@ -12,20 +12,3 @@ export const getWorkspaceSlug = (db: dbClient, slug: string) => {
     where: eq(slugs.slug, slug),
   });
 };
-
-export const createWorkspaceSlugCheck = (
-  db: dbClient,
-  input: {
-    slug: string;
-    userId: string;
-    available: boolean;
-    reserved: boolean;
-  },
-) => {
-  return db.insert(slugChecks).values({
-    slug: input.slug,
-    available: input.available,
-    reserved: input.reserved,
-    createdBy: input.userId,
-  });
-};

packages/db/src/schema/subscriptions.ts

@@ -13,10 +13,9 @@ import { workspaces } from "./workspaces";
 export const subscription = pgTable("subscription", {
   id: bigserial("id", { mode: "number" }).primaryKey(),
   plan: varchar("plan", { length: 255 }).notNull(),
-  referenceId: varchar("referenceId", { length: 12 }).references(
-    () => workspaces.publicId,
-    { onDelete: "set null" },
-  ),
+  referenceId: varchar("referenceId", { length: 12 })
+    .notNull()
+    .references(() => workspaces.publicId),
   stripeCustomerId: varchar("stripeCustomerId", { length: 255 }),
   stripeSubscriptionId: varchar("stripeSubscriptionId", { length: 255 }),
   status: varchar("status", { length: 255 }).notNull(),
@@ -24,7 +23,6 @@ export const subscription = pgTable("subscription", {
   periodEnd: timestamp("periodEnd"),
   cancelAtPeriodEnd: boolean("cancelAtPeriodEnd"),
   seats: integer("seats"),
-  unlimitedSeats: boolean("unlimitedSeats").default(false).notNull(),
   trialStart: timestamp("trialStart"),
   trialEnd: timestamp("trialEnd"),
   createdAt: timestamp("createdAt").notNull().defaultNow(),

packages/db/src/schema/workspaces.ts

@@ -2,7 +2,6 @@ import { relations } from "drizzle-orm";
 import {
   bigint,
   bigserial,
-  boolean,
   pgEnum,
   pgTable,
   text,
@@ -19,12 +18,7 @@ export const memberRoles = ["admin", "member", "guest"] as const;
 export type MemberRole = (typeof memberRoles)[number];
 export const memberRoleEnum = pgEnum("role", memberRoles);
 
-export const memberStatuses = [
-  "invited",
-  "active",
-  "removed",
-  "paused",
-] as const;
+export const memberStatuses = ["invited", "active", "removed"] as const;
 export type MemberStatus = (typeof memberStatuses)[number];
 export const memberStatusEnum = pgEnum("member_status", memberStatuses);
 
@@ -109,17 +103,3 @@ export const slugs = pgTable("workspace_slugs", {
   slug: varchar("slug", { length: 255 }).notNull().unique(),
   type: slugTypeEnum("type").notNull(),
 });
-
-export const slugChecks = pgTable("workspace_slug_checks", {
-  id: bigserial("id", { mode: "number" }).primaryKey(),
-  slug: varchar("slug", { length: 255 }).notNull(),
-  available: boolean("available").notNull(),
-  reserved: boolean("reserved").notNull(),
-  workspaceId: bigint("workspaceId", { mode: "number" }).references(
-    () => workspaces.id,
-  ),
-  createdBy: uuid("createdBy").references(() => users.id, {
-    onDelete: "set null",
-  }),
-  createdAt: timestamp("createdAt").defaultNow().notNull(),
-}).enableRLS();

packages/email/src/sendEmail.tsx

@@ -45,14 +45,14 @@ export const sendEmail = async (
       html,
     };
 
-    // if (cloudMailerClient) {
-    //   const response = await cloudMailerClient.emails.send({
-    //     ...options,
-    //     body: html,
-    //   });
+    if (cloudMailerClient) {
+      const response = await cloudMailerClient.emails.send({
+        ...options,
+        body: html,
+      });
 
-    //   return response;
-    // }
+      return response;
+    }
 
     const response = await transporter.sendMail(options);
 

packages/shared/src/utils/index.ts

@@ -1,3 +1,2 @@
 export * from "./generateUID";
 export * from "./generateSlug";
-export * from "./subscriptions";

packages/shared/src/utils/subscriptions.ts

@@ -1,57 +0,0 @@
-export type SubscriptionStatus =
-  | "active"
-  | "trialing"
-  | "past_due"
-  | "canceled"
-  | "unpaid";
-export type SubscriptionPlan = "team" | "pro";
-
-export interface Subscription {
-  id: number | null;
-  plan: string;
-  status: string;
-  seats: number | null;
-  unlimitedSeats: boolean;
-  periodStart: Date | null;
-  periodEnd: Date | null;
-  referenceId: string | null;
-  stripeSubscriptionId: string | null;
-  stripeCustomerId: string | null;
-  createdAt: Date;
-  updatedAt: Date;
-}
-
-export const getActiveSubscriptions = (
-  subscriptions: Subscription[] | undefined,
-) => {
-  if (!subscriptions) return [];
-  return subscriptions.filter(
-    (sub) => sub.status === "active" || sub.status === "trialing",
-  );
-};
-
-export const getSubscriptionByPlan = (
-  subscriptions: Subscription[] | undefined,
-  plan: SubscriptionPlan,
-) => {
-  if (!subscriptions) return undefined;
-  return subscriptions.find(
-    (sub) =>
-      sub.plan === plan &&
-      (sub.status === "active" || sub.status === "trialing"),
-  );
-};
-
-export const hasActiveSubscription = (
-  subscriptions: Subscription[] | undefined,
-  plan: SubscriptionPlan,
-) => {
-  return getSubscriptionByPlan(subscriptions, plan) !== undefined;
-};
-
-export const hasUnlimitedSeats = (
-  subscriptions: Subscription[] | undefined,
-) => {
-  const activeSubscriptions = getActiveSubscriptions(subscriptions);
-  return activeSubscriptions.some((sub) => sub.unlimitedSeats);
-};

packages/stripe/src/index.ts

@@ -64,7 +64,7 @@ export const updateSubscriptionSeats = async (
           quantity: newQuantity,
         },
       ],
-      proration_behavior: "create_prorations",
+      proration_behavior: "always_invoice", // Invoice immediately
     },
   );
 

pnpm-lock.yaml

@@ -205,9 +205,6 @@ importers:
       react-icons:
         specifier: ^5.5.0
         version: 5.5.0(react@18.3.1)
-      react-image-crop:
-        specifier: ^11.0.10
-        version: 11.0.10(react@18.3.1)
       react-lottie-player:
         specifier: ^1.5.5
         version: 1.5.6(react@18.3.1)
@@ -6119,11 +6116,6 @@ packages:
     peerDependencies:
       react: '*'
 
-  react-image-crop@11.0.10:
-    resolution: {integrity: sha512-+5FfDXUgYLLqBh1Y/uQhIycpHCbXkI50a+nbfkB1C0xXXUTwkisHDo2QCB1SQJyHCqIuia4FeyReqXuMDKWQTQ==}
-    peerDependencies:
-      react: '>=16.13.1'
-
   react-is@16.13.1:
     resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
 
@@ -13704,10 +13696,6 @@ snapshots:
     dependencies:
       react: 18.3.1
 
-  react-image-crop@11.0.10(react@18.3.1):
-    dependencies:
-      react: 18.3.1
-
   react-is@16.13.1: {}
 
   react-is@17.0.2: {}

turbo.json

@@ -99,11 +99,7 @@
     "NEXT_PUBLIC_WHITE_LABEL_HIDE_POWERED_BY",
     "STRIPE_SECRET_KEY",
     "STRIPE_WEBHOOK_SECRET",
-    "STRIPE_WEBHOOK_SECRET_LEGACY",
-    "STRIPE_PRO_PLAN_MONTHLY_PRICE_ID",
-    "STRIPE_PRO_PLAN_YEARLY_PRICE_ID",
-    "STRIPE_TEAM_PLAN_MONTHLY_PRICE_ID",
-    "STRIPE_TEAM_PLAN_YEARLY_PRICE_ID",
+    "STRIPE_PRO_PLAN_PRICE_ID",
     "NEXT_PUBLIC_STORAGE_DOMAIN",
     "NEXT_PUBLIC_STORAGE_URL",
     "NEXT_PUBLIC_AVATAR_BUCKET_NAME",