diff --git a/server/src/main/scala/com/lbs/server/actor/Account.scala b/server/src/main/scala/com/lbs/server/actor/Account.scala
index 9f9e312..21ff56d 100644
--- a/server/src/main/scala/com/lbs/server/actor/Account.scala
+++ b/server/src/main/scala/com/lbs/server/actor/Account.scala
@@ -39,8 +39,9 @@ class Account(val userId: UserId, bot: Bot, dataService: DataService, val locali
whenSafe(AskAction) {
case Event(Next, _) =>
val credentials = dataService.getUserCredentials(userId.userId)
+ val currentAccount = credentials.find(c => c.accountId == userId.accountId).getOrElse(sys.error("Can't determine current account"))
val buttons = Seq(Button(lang.addAccount, -1L), Button(lang.deleteAccount, -2L)) ++ credentials.map(c => Button(s"🔐️ ${c.username}", c.accountId))
- bot.sendMessage(userId.source, lang.pleaseChooseAccount, inlineKeyboard = createInlineKeyboard(buttons, columns = 1))
+ bot.sendMessage(userId.source, lang.pleaseChooseAccount(currentAccount.username), inlineKeyboard = createInlineKeyboard(buttons, columns = 1))
goto(AwaitAction)
}
diff --git a/server/src/main/scala/com/lbs/server/lang/En.scala b/server/src/main/scala/com/lbs/server/lang/En.scala
index afb9452..b40d6fa 100644
--- a/server/src/main/scala/com/lbs/server/lang/En.scala
+++ b/server/src/main/scala/com/lbs/server/lang/En.scala
@@ -361,5 +361,8 @@ object En extends Lang {
override def accountSwitched(username: String): String =
s"✅ Account has been switched to $username"
- override def pleaseChooseAccount: String = "➡ Please choose an action or select account"
+ override def pleaseChooseAccount(currentAccountName: String): String =
+ s"""Current account is $currentAccountName
+ |
+ |➡ Please choose an action or select account""".stripMargin
}
diff --git a/server/src/main/scala/com/lbs/server/lang/Lang.scala b/server/src/main/scala/com/lbs/server/lang/Lang.scala
index 7cc7527..c92da68 100644
--- a/server/src/main/scala/com/lbs/server/lang/Lang.scala
+++ b/server/src/main/scala/com/lbs/server/lang/Lang.scala
@@ -238,7 +238,7 @@ trait Lang {
def addAccount: String
- def pleaseChooseAccount: String
+ def pleaseChooseAccount(currentAccountName: String): String
def accountSwitched(username: String): String
}
diff --git a/server/src/main/scala/com/lbs/server/lang/Ua.scala b/server/src/main/scala/com/lbs/server/lang/Ua.scala
index 56da7ff..0566630 100644
--- a/server/src/main/scala/com/lbs/server/lang/Ua.scala
+++ b/server/src/main/scala/com/lbs/server/lang/Ua.scala
@@ -360,5 +360,8 @@ object Ua extends Lang {
override def accountSwitched(username: String): String =
s"✅ Аккаунт було переключено на $username"
- override def pleaseChooseAccount: String = "➡ Будь ласка, оберіть дію або виберіть акаунт"
+ override def pleaseChooseAccount(currentAccountName: String): String =
+ s"""Поточний акаунт $currentAccountName
+ |
+ |➡ Будь ласка, оберіть дію або виберіть акаунт""".stripMargin
}