From 3df3d4a246d10c5ac311ade3bf38cb2f9cdb5278 Mon Sep 17 00:00:00 2001
From: talksik <patel.arjun50@gmail.com>
Date: Sun, 2 Jan 2022 01:45:20 -0800
Subject: [PATCH] adding me to the footer and fixing toast text

---
 nirvana-ios/Views/Convos/ConvoFooterView.swift | 18 ++++++++++++++----
 nirvana-ios/Views/Convos/ConvoViewModel.swift  |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/nirvana-ios/Views/Convos/ConvoFooterView.swift b/nirvana-ios/Views/Convos/ConvoFooterView.swift
index c2eac61..77b27a7 100644
--- a/nirvana-ios/Views/Convos/ConvoFooterView.swift
+++ b/nirvana-ios/Views/Convos/ConvoFooterView.swift
@@ -152,9 +152,19 @@ struct ConvoUsernames: View {
     var unknownUserCount: Int = 0
     
     var body: some View {
-        let userNames = self.users.map{$0.nickname ?? ""}.joined(separator: ", ")
-        Text(unknownUserCount > 0 ? "\(userNames), and \(unknownUserCount) other(s)": userNames)
-            .font(.footnote)
-            .foregroundColor(NirvanaColor.light)
+        if let userId = AuthSessionStore.getCurrentUserId() {
+            let userNames = self.users.map{user in
+                if user.id == userId {
+                    return "me"
+                }
+                
+                return user.nickname ?? ""
+            }.joined(separator: ", ")
+            Text(unknownUserCount > 0 ? "\(userNames), and \(unknownUserCount) other(s)": userNames)
+                .foregroundColor(NirvanaColor.light)
+        }
+        else {
+            EmptyView()
+        }
     }
 }
diff --git a/nirvana-ios/Views/Convos/ConvoViewModel.swift b/nirvana-ios/Views/Convos/ConvoViewModel.swift
index 48988e2..e7fc6dc 100644
--- a/nirvana-ios/Views/Convos/ConvoViewModel.swift
+++ b/nirvana-ios/Views/Convos/ConvoViewModel.swift
@@ -35,7 +35,7 @@ class ConvoViewModel: NSObject, ObservableObject {
             case .connecting:
                 return AlertToast(displayMode: .hud, type: .systemImage("sensor.tag.radiowaves.forward.fill", NirvanaColor.dimTeal), title: "Connecting")
             case .disconnected:
-                return AlertToast(displayMode: .hud, type: .systemImage("hand.wave.fill", Color.orange), title: "disconnected")
+                return AlertToast(displayMode: .hud, type: .systemImage("hand.wave.fill", Color.orange), title: "bye!")
             case .successfullyAddedThirdParty:
                 return AlertToast(displayMode: .hud, type: .complete(Color.green), title: "added friend to convo")
             case .cantAddThirdParty: