Merge pull request #2104 from BEDOLAGA-DEV/axy4i1-bedolaga/fix-telegram-api-error-in-show_balance_menu

Handle balance menu for YooKassa SBP QR and add Heleket localization keys

app/handlers/balance/main.py

@@ -94,15 +94,38 @@ async def show_balance_menu(
     db: AsyncSession
 ):
     texts = get_texts(db_user.language)
-    
+
     balance_text = texts.BALANCE_INFO.format(
         balance=texts.format_price(db_user.balance_kopeks)
     )
-    
-    await callback.message.edit_text(
-        balance_text,
-        reply_markup=get_balance_keyboard(db_user.language)
-    )
+
+    reply_markup = get_balance_keyboard(db_user.language)
+
+    try:
+        if callback.message and callback.message.text:
+            await callback.message.edit_text(
+                balance_text,
+                reply_markup=reply_markup
+            )
+        elif callback.message and callback.message.caption:
+            await callback.message.edit_caption(
+                balance_text,
+                reply_markup=reply_markup
+            )
+        else:
+            await callback.message.answer(
+                balance_text,
+                reply_markup=reply_markup
+            )
+    except TelegramBadRequest as error:
+        logger.warning(
+            "Failed to edit balance message, sending a new one instead: %s",
+            error,
+        )
+        await callback.message.answer(
+            balance_text,
+            reply_markup=reply_markup
+        )
     await callback.answer()
 
 

app/localization/locales/en.json

@@ -1087,6 +1087,8 @@
   "PAYMENT_METHOD_SUPPORT_NAME": "🛠️ <b>Support team</b>",
   "PAYMENT_METHOD_TRIBUTE_DESCRIPTION": "via Tribute",
   "PAYMENT_METHOD_TRIBUTE_NAME": "💳 <b>Bank card</b>",
+  "PAYMENT_METHOD_HELEKET_DESCRIPTION": "via Heleket",
+  "PAYMENT_METHOD_HELEKET_NAME": "🪙 <b>Cryptocurrency (Heleket)</b>",
   "PAYMENT_METHOD_YOOKASSA_DESCRIPTION": "via YooKassa",
   "PAYMENT_METHOD_YOOKASSA_NAME": "💳 <b>Bank card</b>",
   "PAYMENT_METHOD_YOOKASSA_SBP_DESCRIPTION": "via YooKassa Fast Payment System",

app/localization/locales/ru.json

@@ -1099,6 +1099,8 @@
   "PAYMENT_METHOD_SUPPORT_NAME": "🛠️ <b>Через поддержку</b>",
   "PAYMENT_METHOD_TRIBUTE_DESCRIPTION": "через Tribute",
   "PAYMENT_METHOD_TRIBUTE_NAME": "💳 <b>Банковская карта</b>",
+  "PAYMENT_METHOD_HELEKET_DESCRIPTION": "через Heleket",
+  "PAYMENT_METHOD_HELEKET_NAME": "🪙 <b>Криптовалюта (Heleket)</b>",
   "PAYMENT_METHOD_YOOKASSA_DESCRIPTION": "через YooKassa",
   "PAYMENT_METHOD_YOOKASSA_NAME": "💳 <b>Банковская карта</b>",
   "PAYMENT_METHOD_YOOKASSA_SBP_DESCRIPTION": "через систему быстрых платежей YooKassa",

app/localization/locales/ua.json

@@ -1093,10 +1093,12 @@
 "PAYMENT_METHOD_PLATEGA_NAME": "💳 <b>Банківська картка (Platega)</b>",
  "PAYMENT_METHOD_STARS_DESCRIPTION": "швидко та зручно",
  "PAYMENT_METHOD_STARS_NAME": "⭐ <b>Telegram Stars</b>",
- "PAYMENT_METHOD_SUPPORT_DESCRIPTION": "інші способи",
- "PAYMENT_METHOD_SUPPORT_NAME": "🛠️ <b>Через підтримку</b>",
+"PAYMENT_METHOD_SUPPORT_DESCRIPTION": "інші способи",
+"PAYMENT_METHOD_SUPPORT_NAME": "🛠️ <b>Через підтримку</b>",
 "PAYMENT_METHOD_TRIBUTE_DESCRIPTION": "через Tribute",
 "PAYMENT_METHOD_TRIBUTE_NAME": "💳 <b>Банківська картка</b>",
+"PAYMENT_METHOD_HELEKET_DESCRIPTION": "через Heleket",
+"PAYMENT_METHOD_HELEKET_NAME": "🪙 <b>Криптовалюта (Heleket)</b>",
 "PAYMENT_METHOD_YOOKASSA_DESCRIPTION": "через YooKassa",
 "PAYMENT_METHOD_YOOKASSA_NAME": "💳 <b>Банківська картка</b>",
  "PAYMENT_METHOD_YOOKASSA_SBP_DESCRIPTION": "через систему швидких платежів YooKassa",

app/localization/locales/zh.json

@@ -1096,6 +1096,8 @@
 "PAYMENT_METHOD_SUPPORT_NAME":"🛠️<b>通过支持</b>",
 "PAYMENT_METHOD_TRIBUTE_DESCRIPTION":"通过Tribute",
 "PAYMENT_METHOD_TRIBUTE_NAME":"💳<b>银行卡</b>",
+"PAYMENT_METHOD_HELEKET_DESCRIPTION":"通过Heleket",
+"PAYMENT_METHOD_HELEKET_NAME":"🪙<b>加密货币(Heleket)</b>",
 "PAYMENT_METHOD_YOOKASSA_DESCRIPTION":"通过YooKassa",
 "PAYMENT_METHOD_YOOKASSA_NAME":"💳<b>银行卡</b>",
 "PAYMENT_METHOD_YOOKASSA_SBP_DESCRIPTION":"通过YooKassa快速支付系统",