ProfilePage: Tabs and Telegram Stuff. Fix (#998)

Signed-off-by: Aleksandr Muravja <[email protected]>
kyberorg · Jan 22, 2023 · 8e95c75 · 8e95c75
1 parent 9dc9c1c
commit 8e95c75
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java b/src/main/java/pm/axe/ui/pages/user/profile/tabs/ProfileTab.java
@@ -85,11 +85,14 @@ public void tabInit(final User user) {
 
         //telegram section
         FlexLayout telegramLayout = new FlexLayout();
+        telegramLayout.setAlignItems(Alignment.BASELINE);
+
         Optional<Account> telegramAccount = getTelegramAccount();
-        if (telegramAccount.isPresent()) {
+        Optional<String> telegramUsername = getTelegramUsername();
+        if (telegramAccount.isPresent() && telegramUsername.isPresent()) { //FIXME fix logic
             TextField telegramField = new TextField("Telegram");
             telegramField.setPrefixComponent(VaadinIcon.AT.create());
-            telegramField.setValue(telegramAccount.get().getAccountName());
+            telegramField.setValue(telegramUsername.get());
             Button unlink = new Button("Unlink");
             telegramLayout.add(telegramField, unlink);
         } else {
@@ -139,4 +142,13 @@ private Optional<Token> getTelegramToken() {
         }
         return Optional.ofNullable(tgToken);
     }
+
+    private Optional<String> getTelegramUsername() {
+        Optional<Account> telegramAccount = getTelegramAccount();
+        if (telegramAccount.isPresent()) {
+            return accountService.decryptAccountName(telegramAccount.get());
+        } else {
+            return Optional.empty();
+        }
+    }
 }