From 3caf855d4a88d15efb800da2c48e2a1b33f92270 Mon Sep 17 00:00:00 2001
From: AI Assistant <ai@clientright.ru>
Date: Thu, 30 Oct 2025 09:52:26 +0300
Subject: [PATCH] =?UTF-8?q?ui:=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=20email=20?=
 =?UTF-8?q?=D1=81=D0=BE=20=D1=88=D0=B0=D0=B3=D0=B0=201,=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=B5=D1=81=D1=91=D0=BD=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D0=B8=D0=B9=20=D1=88?=
 =?UTF-8?q?=D0=B0=D0=B3\n\n-=20Step1Phone:=20=D1=82=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BA=D0=BE=20=D1=82=D0=B5=D0=BB=D0=B5=D1=84=D0=BE=D0=BD=20+?=
 =?UTF-8?q?=20SMS\n-=20Step3Payment:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BB=D0=B5=20email?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/form/Step1Phone.tsx   | 24 ++++---------------
 frontend/src/components/form/Step3Payment.tsx | 19 ++++++++++++++-
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/frontend/src/components/form/Step1Phone.tsx b/frontend/src/components/form/Step1Phone.tsx
index 3659566..a4825ee 100644
--- a/frontend/src/components/form/Step1Phone.tsx
+++ b/frontend/src/components/form/Step1Phone.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { Form, Input, Button, message, Space } from 'antd';
-import { PhoneOutlined, SafetyOutlined, MailOutlined } from '@ant-design/icons';
+import { PhoneOutlined, SafetyOutlined } from '@ant-design/icons';
 
 interface Props {
   formData: any;
@@ -24,7 +24,7 @@ export default function Step1Phone({
 
   const sendCode = async () => {
     try {
-      const values = await form.validateFields(['phone', 'email']);
+      const values = await form.validateFields(['phone']);
       const phone = values.phone;
 
       setLoading(true);
@@ -46,7 +46,7 @@ export default function Step1Phone({
         });
         message.success('Код отправлен на ваш телефон');
         setCodeSent(true);
-        updateFormData({ phone: values.phone, email: values.email });
+        updateFormData({ phone: values.phone });
         if (result.debug_code) {
           message.info(`DEBUG: Код ${result.debug_code}`);
         }
@@ -56,7 +56,7 @@ export default function Step1Phone({
       }
     } catch (error) {
       if ((error as any)?.errorFields) {
-        message.error('Введите телефон и email');
+        message.error('Введите номер телефона');
       } else {
         message.error('Ошибка соединения с сервером');
       }
@@ -127,22 +127,6 @@ export default function Step1Phone({
         />
       </Form.Item>
 
-      <Form.Item
-        label="Электронная почта"
-        name="email"
-        rules={[
-          { required: true, message: 'Введите email' },
-          { type: 'email', message: 'Неверный формат email' }
-        ]}
-      >
-        <Input 
-          prefix={<MailOutlined />}
-          placeholder="example@mail.ru"
-          size="large"
-          type="email"
-        />
-      </Form.Item>
-
       <Form.Item>
         {!codeSent ? (
           <Button type="primary" onClick={sendCode} loading={loading} block>
diff --git a/frontend/src/components/form/Step3Payment.tsx b/frontend/src/components/form/Step3Payment.tsx
index 1333098..58da243 100644
--- a/frontend/src/components/form/Step3Payment.tsx
+++ b/frontend/src/components/form/Step3Payment.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { Form, Input, Button, Select, message, Divider } from 'antd';
-import { QrcodeOutlined } from '@ant-design/icons';
+import { QrcodeOutlined, MailOutlined } from '@ant-design/icons';
 
 const { Option } = Select;
 
@@ -72,6 +72,23 @@ export default function Step3Payment({
         </div>
       )}
 
+      {/* Email собираем на последнем шаге */}
+      <Form.Item
+        label="Электронная почта"
+        name="email"
+        rules={[
+          { required: true, message: 'Введите email' },
+          { type: 'email', message: 'Неверный формат email' }
+        ]}
+      >
+        <Input 
+          prefix={<MailOutlined />}
+          placeholder="example@mail.ru" 
+          size="large" 
+          type="email"
+        />
+      </Form.Item>
+
       {/* Блок выплаты (показывается только после верификации) */}
       {isPhoneVerified && (
         <>