From 819106b0f254c6ecda7ecf673e6bce20e91e1e53 Mon Sep 17 00:00:00 2001
From: Morgan Pretty <morgan.t.pretty@gmail.com>
Date: Thu, 5 Oct 2023 11:58:56 +1100
Subject: [PATCH] Fixed a bug where profiles with blank name values wouldn't
 fallback correctly

---
 SessionMessagingKit/Database/Models/Profile.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SessionMessagingKit/Database/Models/Profile.swift b/SessionMessagingKit/Database/Models/Profile.swift
index 4bbca5f52..e2076269e 100644
--- a/SessionMessagingKit/Database/Models/Profile.swift
+++ b/SessionMessagingKit/Database/Models/Profile.swift
@@ -352,9 +352,9 @@ public extension Profile {
         nickname: String?,
         customFallback: String? = nil
     ) -> String {
-        if let nickname: String = nickname { return nickname }
+        if let nickname: String = nickname, !nickname.isEmpty { return nickname }
         
-        guard let name: String = name, name != id else {
+        guard let name: String = name, name != id, !name.isEmpty else {
             return (customFallback ?? Profile.truncated(id: id, threadVariant: threadVariant))
         }