From a9c3aa9c1951f1542eea77dc8a58d97ce0d25ae8 Mon Sep 17 00:00:00 2001
From: Diogo <diogofncunha@gmail.com>
Date: Thu, 12 Dec 2024 15:56:30 +0000
Subject: [PATCH] changes

---
 .../Views/ChatList/ChatListNavLink.swift      | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/apps/ios/Shared/Views/ChatList/ChatListNavLink.swift b/apps/ios/Shared/Views/ChatList/ChatListNavLink.swift
index 5e6032955f..1e13242f1c 100644
--- a/apps/ios/Shared/Views/ChatList/ChatListNavLink.swift
+++ b/apps/ios/Shared/Views/ChatList/ChatListNavLink.swift
@@ -643,6 +643,10 @@ struct ChatListTag: View {
                     chatTagsModel.tags = userTags.map {
                         .chatTag(emoji: $0.chatTagEmoji, text: $0.chatTagText, tagId: $0.chatTagId)
                     }
+                    if case let .chatTag(_, _, tagId) = chatTagsModel.selectedTag,
+                       !userTags.contains(where: { $0.chatTagId == tagId }) {
+                        chatTagsModel.selectedTag = nil
+                    }
                     updateChatTags(chat: chat, chatTags: chatTags)
                 }
             } catch let error {
@@ -676,13 +680,29 @@ struct CreateChatListTag: View {
     
     var body: some View {
         List {
-            TextField("Emoji..", text: $emoji)
-            TextField("List name...", text: $name)
+            HStack {
+                Button {
+                    emoji = "🚀"
+                } label: {
+                    if emoji.isEmpty {
+                        Image(systemName: "face.smiling")
+                            .resizable()
+                            .scaledToFit()
+                            .frame(width: 18, height: 18)
+                            .foregroundColor(.secondary)
+                    } else {
+                        Text(emoji)
+                    }
+                }
+                TextField("List name...", text: $name)
+            }
+
             Button {
                 createChatTag()
             } label: {
                 Text("Create list")
             }
+            .disabled(emoji.isEmpty || name.isEmpty)
         }
     }