From 4e2b7e6bb9b989756825b3f932e6f9e576810b1b Mon Sep 17 00:00:00 2001
From: Martti Malmi <sirius@iki.fi>
Date: Fri, 6 Oct 2023 11:57:46 +0300
Subject: [PATCH] check name.length > 0

---
 packages/app/src/Element/User/DisplayName.tsx   | 4 ++--
 packages/app/src/Pages/FreeNostrAddressPage.tsx | 2 +-
 packages/app/src/Pages/MessagesPage.tsx         | 2 +-
 packages/app/src/Pages/Notifications.tsx        | 2 +-
 packages/app/src/Pages/ProfilePage.tsx          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/app/src/Element/User/DisplayName.tsx b/packages/app/src/Element/User/DisplayName.tsx
index 0b132a025..b7e58f8fe 100644
--- a/packages/app/src/Element/User/DisplayName.tsx
+++ b/packages/app/src/Element/User/DisplayName.tsx
@@ -18,9 +18,9 @@ export function getDisplayNameOrPlaceHolder(user: UserMetadata | undefined, pubk
   let name = hexToBech32(NostrPrefix.PublicKey, pubkey).substring(0, 12);
   let isPlaceHolder = false;
 
-  if (user?.display_name) {
+  if (typeof user?.display_name === "string" && user.display_name.length > 0) {
     name = user.display_name;
-  } else if (user?.name) {
+  } else if (typeof user?.name === "string" && user.name.length > 0) {
     name = user.name;
   } else if (pubkey && process.env.ANIMAL_NAME_PLACEHOLDERS) {
     name = AnimalName(pubkey);
diff --git a/packages/app/src/Pages/FreeNostrAddressPage.tsx b/packages/app/src/Pages/FreeNostrAddressPage.tsx
index a3d5ca241..17f71ace1 100644
--- a/packages/app/src/Pages/FreeNostrAddressPage.tsx
+++ b/packages/app/src/Pages/FreeNostrAddressPage.tsx
@@ -6,7 +6,7 @@ import Nip5Service from "Element/Nip5Service";
  */
 
 import messages from "./messages";
-import IrisAccount from "../Element/IrisAccount/IrisAccount";
+import IrisAccount from "Element/IrisAccount/IrisAccount";
 
 export default function FreeNostrAddressPage() {
   return (
diff --git a/packages/app/src/Pages/MessagesPage.tsx b/packages/app/src/Pages/MessagesPage.tsx
index a5c609a27..35a09d3c1 100644
--- a/packages/app/src/Pages/MessagesPage.tsx
+++ b/packages/app/src/Pages/MessagesPage.tsx
@@ -25,7 +25,7 @@ import { useEventFeed } from "Feed/EventFeed";
 import { LoginSession, LoginStore } from "Login";
 import { Nip28ChatSystem } from "chat/nip28";
 import { ChatParticipantProfile } from "Element/Chat/ChatParticipant";
-import { getDisplayName } from "../Element/User/DisplayName";
+import { getDisplayName } from "Element/User/DisplayName";
 
 const TwoCol = 768;
 const ThreeCol = 1500;
diff --git a/packages/app/src/Pages/Notifications.tsx b/packages/app/src/Pages/Notifications.tsx
index d03b8a90b..a37840075 100644
--- a/packages/app/src/Pages/Notifications.tsx
+++ b/packages/app/src/Pages/Notifications.tsx
@@ -19,7 +19,7 @@ import Text from "Element/Text";
 import { formatShort } from "Number";
 import { LiveEvent } from "Element/LiveEvent";
 import ProfilePreview from "Element/User/ProfilePreview";
-import { getDisplayName } from "../Element/User/DisplayName";
+import { getDisplayName } from "Element/User/DisplayName";
 
 function notificationContext(ev: TaggedNostrEvent) {
   switch (ev.kind) {
diff --git a/packages/app/src/Pages/ProfilePage.tsx b/packages/app/src/Pages/ProfilePage.tsx
index d1c8d0661..5c2501ade 100644
--- a/packages/app/src/Pages/ProfilePage.tsx
+++ b/packages/app/src/Pages/ProfilePage.tsx
@@ -58,7 +58,7 @@ import { ZapTarget } from "Zapper";
 import { useStatusFeed } from "Feed/StatusFeed";
 
 import messages from "./messages";
-import { SpotlightMediaModal } from "../Element/Deck/SpotlightMedia";
+import { SpotlightMediaModal } from "Element/Deck/SpotlightMedia";
 
 const NOTES = 0;
 const REACTIONS = 1;