v11

src/components/pnAccountBlockName.vue

@@ -9,12 +9,7 @@
       {{ customer.email }}
     </span>
     <span v-else class="ellipsis">
-      {{
-        tgUser?.first_name + 
-        (tgUser?.first_name && tgUser?.last_name ? ' ' : '') +
-        tgUser?.last_name +
-        (!(tgUser?.first_name || tgUser?.last_name) ? tgUser?.username : '')
-      }}
+      {{ nameTgUser(tgUser) }}
     </span>
   </div>
 </template>
@@ -22,13 +17,13 @@
 <script setup lang="ts">
   import { inject } from 'vue'
   import { useAuthStore } from 'stores/auth'
-  import type { WebApp } from '@twa-dev/types'
+  import { nameTgUser } from 'utils/helpers'
+  import type { WebApp, WebAppUser } from '@twa-dev/types'
 
   const authStore = useAuthStore()
   const customer = authStore.customer
   const tg = inject('tg') as WebApp
-  const tgUser = tg.initDataUnsafe.user
-
+  const tgUser = tg.initDataUnsafe.user as WebAppUser | undefined
 </script>
 
 <style lang="scss">