Split DM create form into separate username and server fields with smart defaults.

public/locales/en.json

@@ -369,11 +369,12 @@
     "no_direct_messages_desc": "You do not have any direct messages yet.",
     "direct_message": "Direct Message",
     "create_chat": "Create Chat",
-    "create_chat_subtitle": "Start a private, encrypted chat by entering a user ID.",
+    "create_chat_subtitle": "Start a private, encrypted chat by entering a username.",
     "chats": "Chats",
-    "user_id": "User ID",
-    "user_id_placeholder": "@username:server",
-    "invalid_user_id": "Please enter a valid User ID.",
+    "username": "Username",
+    "username_placeholder": "username",
+    "server": "Server",
+    "invalid_user_id": "Please enter a valid username and server.",
     "options": "Options",
     "e2e_encryption": "End-to-End Encryption",
     "e2e_encryption_desc": "Once this feature is enabled, it can't be disabled after the room is created.",

public/locales/ru.json

@@ -369,11 +369,12 @@
     "no_direct_messages_desc": "У вас ещё нет личных сообщений.",
     "direct_message": "Новый чат",
     "create_chat": "Новый чат",
-    "create_chat_subtitle": "Начните приватный зашифрованный чат, указав ID пользователя.",
+    "create_chat_subtitle": "Начните приватный зашифрованный чат, указав имя пользователя.",
     "chats": "Чаты",
-    "user_id": "ID пользователя",
-    "user_id_placeholder": "@username:server",
-    "invalid_user_id": "Введите корректный ID пользователя.",
+    "username": "Имя пользователя",
+    "username_placeholder": "username",
+    "server": "Сервер",
+    "invalid_user_id": "Введите корректные имя пользователя и сервер.",
     "options": "Параметры",
     "e2e_encryption": "Сквозное шифрование",
     "e2e_encryption_desc": "После включения эту функцию нельзя отключить после создания комнаты.",

src/app/features/create-chat/CreateChat.tsx

@@ -1,11 +1,30 @@
-import { Box, Button, color, config, Icon, Icons, Input, Spinner, Switch, Text } from 'folds';
+import {
+  Box,
+  Button,
+  color,
+  config,
+  Icon,
+  Icons,
+  Input,
+  Spinner,
+  Switch,
+  Text,
+  toRem,
+} from 'folds';
 import React, { FormEventHandler, useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ICreateRoomStateEvent, MatrixError, Preset, Visibility } from 'matrix-js-sdk';
 import { useNavigate } from 'react-router-dom';
 import { SettingTile } from '../../components/setting-tile';
 import { SequenceCard } from '../../components/sequence-card';
-import { addRoomIdToMDirect, getDMRoomFor, isUserId } from '../../utils/matrix';
+import {
+  addRoomIdToMDirect,
+  getDMRoomFor,
+  getMxIdLocalPart,
+  getMxIdServer,
+  isServerName,
+  isUserId,
+} from '../../utils/matrix';
 import { useMatrixClient } from '../../hooks/useMatrixClient';
 import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
 import { ErrorCode } from '../../cs-errorcode';
@@ -14,6 +33,8 @@ import { createRoomEncryptionState } from '../../components/create-room';
 import { useAlive } from '../../hooks/useAlive';
 import { getDirectRoomPath } from '../../pages/pathUtils';
 
+const FALLBACK_SERVER = 'vojo.chat';
+
 type CreateChatProps = {
   defaultUserId?: string;
 };
@@ -23,6 +44,10 @@ export function CreateChat({ defaultUserId }: CreateChatProps) {
   const alive = useAlive();
   const navigate = useNavigate();
 
+  const userServer = getMxIdServer(mx.getSafeUserId()) ?? FALLBACK_SERVER;
+  const defaultUsername = defaultUserId ? getMxIdLocalPart(defaultUserId) : undefined;
+  const defaultServer = defaultUserId ? getMxIdServer(defaultUserId) : undefined;
+
   const [encryption, setEncryption] = useState(false);
   const [invalidUserId, setInvalidUserId] = useState(false);
 
@@ -57,28 +82,42 @@ export function CreateChat({ defaultUserId }: CreateChatProps) {
     setInvalidUserId(false);
 
     const target = evt.target as HTMLFormElement | undefined;
-    const userIdInput = target?.userIdInput as HTMLInputElement | undefined;
-    const userId = userIdInput?.value.trim();
+    const usernameInput = target?.usernameInput as HTMLInputElement | undefined;
+    const serverInput = target?.serverInput as HTMLInputElement | undefined;
+    let rawUsername = usernameInput?.value.trim() ?? '';
+    const server = serverInput?.value.trim() || userServer;
 
-    if (!userIdInput || !userId) return;
-    if (!isUserId(userId)) {
+    if (!usernameInput || !rawUsername) return;
+
+    // If user pasted a full MXID like @alice:matrix.org, split it into fields
+    if (isUserId(rawUsername)) {
+      const parsedLocal = getMxIdLocalPart(rawUsername);
+      const parsedServer = getMxIdServer(rawUsername);
+      if (parsedLocal && parsedServer) {
+        rawUsername = parsedLocal;
+        usernameInput.value = parsedLocal;
+        if (serverInput) serverInput.value = parsedServer;
+      }
+    }
+
+    const username = rawUsername.replace(/^@/, '');
+    if (!username || /[@:\s]/.test(username) || !isServerName(server)) {
       setInvalidUserId(true);
       return;
     }
 
-    // Route to an existing DM (encrypted or not) before creating a new room;
-    // otherwise every submit from the card's "Message" button creates a new
-    // duplicate room even when a perfectly fine DM already exists.
+    const userId = `@${username}:${server}`;
+
     const existing = getDMRoomFor(mx, userId);
     if (existing) {
-      userIdInput.value = '';
+      usernameInput.value = '';
       navigate(getDirectRoomPath(existing.roomId));
       return;
     }
 
     create(userId, encryption).then((roomId) => {
       if (alive()) {
-        userIdInput.value = '';
+        usernameInput.value = '';
         navigate(getDirectRoomPath(roomId));
       }
     });
@@ -87,19 +126,36 @@ export function CreateChat({ defaultUserId }: CreateChatProps) {
   return (
     <Box as="form" onSubmit={handleSubmit} grow="Yes" direction="Column" gap="500">
       <Box direction="Column" gap="100">
-        <Text size="L400">{t('Direct.user_id')}</Text>
-        <Input
-          defaultValue={defaultUserId}
-          placeholder={t('Direct.user_id_placeholder')}
-          name="userIdInput"
-          variant="SurfaceVariant"
-          size="500"
-          radii="400"
-          required
-          autoFocus
-          autoComplete="off"
-          disabled={disabled}
-        />
+        <Box direction="Row" wrap="Wrap" gap="200">
+          <Box grow="Yes" style={{ minWidth: toRem(120) }} direction="Column" gap="100">
+            <Text size="L400">{t('Direct.username')}</Text>
+            <Input
+              defaultValue={defaultUsername}
+              placeholder={t('Direct.username_placeholder')}
+              name="usernameInput"
+              variant="SurfaceVariant"
+              size="500"
+              radii="400"
+              required
+              autoFocus
+              autoComplete="off"
+              disabled={disabled}
+            />
+          </Box>
+          <Box shrink="No" style={{ minWidth: toRem(150) }} direction="Column" gap="100">
+            <Text size="L400">{t('Direct.server')}</Text>
+            <Input
+              defaultValue={defaultServer && defaultServer !== userServer ? defaultServer : undefined}
+              placeholder={userServer}
+              name="serverInput"
+              variant="SurfaceVariant"
+              size="500"
+              radii="400"
+              autoComplete="off"
+              disabled={disabled}
+            />
+          </Box>
+        </Box>
         {invalidUserId && (
           <Box style={{ color: color.Critical.Main }} alignItems="Center" gap="100">
             <Icon src={Icons.Warning} filled size="50" />

src/app/pages/client/direct/DirectCreate.tsx

@@ -61,9 +61,7 @@ export function DirectCreate() {
               <PageHeroSection>
                 <Box direction="Column" gap="700">
                   <PageHero
-                    icon={<Icon size="600" src={Icons.Mention} />}
                     title={t('Direct.create_chat')}
-                    subTitle={t('Direct.create_chat_subtitle')}
                   />
                   <CreateChat defaultUserId={userId} />
                 </Box>