The text of the welcome message has been changed, the text of the risk management settings has been changed, the default value for "maximum_trade_risk" in the database has been changed from 1 to 100. The message upon re-clicking the "Start Trading" button has been removed.

app/telegram/handlers/handlers.py

@@ -20,7 +20,6 @@ router = Router()
 @router.message(CommandStart())
 async def start_message(message: Message):
     await rq.set_new_user_bybit_api(message.from_user.id)
-
     await func.start_message(message)
 
 @router.message(F.text == "👤 Профиль")
@@ -38,12 +37,19 @@ async def settings_msg(message: Message):
         await func.settings_message(message)
 
 @router.callback_query(F.data == "clb_start_chatbot_message")
-async def clb_func_reg (callback: CallbackQuery):
+async def clb_profile_msg (callback: CallbackQuery):
     user = await rq.check_user(callback.from_user.id)
 
-    if user:
-        await callback.message.answer(f'С возвращением, {callback.from_user.username}!', reply_markup=reply_markup.base_buttons_markup)
-        
+    username = ''
+    
+    if callback.from_user.first_name == None: 
+        username = callback.from_user.last_name
+    elif callback.from_user.last_name == None:
+        username = callback.from_user.first_name
+    else:
+        username = f'{callback.from_user.first_name} {callback.from_user.last_name}'
+
+    if user:      
         await func.profile_message(callback.from_user.username, callback.message)
     else:
         await rq.save_tg_id_new_user(callback.from_user.id)
@@ -53,18 +59,9 @@ async def clb_func_reg (callback: CallbackQuery):
         await func_condition_settings.reg_new_user_default_condition_settings(callback.from_user.id, callback.message) 
         await func_additional_settings.reg_new_user_default_additional_settings(callback.from_user.id, callback.message)
 
-        await callback.message.answer(f'Регистрация прошла успешно, перейдите в профиль нажав на кнопку!', reply_markup=reply_markup.base_buttons_markup)
+        await callback.message.answer(f'Здравствуйте, {username}!', reply_markup=reply_markup.base_buttons_markup)
 
-        await func.profile_message(callback.from_user.username, callback.message)
-
-    await callback.answer()
-    
-@router.callback_query(F.data == "callback_profile")
-async def clb_profile_message (callback: CallbackQuery):
-    user = await rq.check_user(callback.from_user.id)
-
-    if user:
-        await func.profile_message(callback.from_user.username, callback.message)
+        await func.profile_message(username, callback.message)
 
     await callback.answer()