From b4ec4df68741c7821b5326998d00b2cb10a60eac Mon Sep 17 00:00:00 2001
From: Levitating Pineapple <noreply@levitatingpineapple.com>
Date: Mon, 23 Sep 2024 23:55:05 +0300
Subject: [PATCH] cleanup; dismiss

---
 apps/ios/Shared/Views/ChatList/ChatListView.swift | 2 +-
 apps/ios/Shared/Views/ChatList/UserPicker.swift   | 5 +++--
 apps/ios/Shared/Views/Helpers/SwiftUISheet.swift  | 7 -------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/apps/ios/Shared/Views/ChatList/ChatListView.swift b/apps/ios/Shared/Views/ChatList/ChatListView.swift
index cad83784b6..31d057df8e 100644
--- a/apps/ios/Shared/Views/ChatList/ChatListView.swift
+++ b/apps/ios/Shared/Views/ChatList/ChatListView.swift
@@ -60,7 +60,7 @@ struct ChatListView: View {
         }
         .modifier(
             SwiftUISheet(height: 400, isPresented: $userPickerShown) {
-                UserPicker(activeSheet: $activeUserPickerSheet)
+                UserPicker(userPickerShown: $userPickerShown, activeSheet: $activeUserPickerSheet)
             }
         )
         .sheet(item: $activeUserPickerSheet) { sheet in
diff --git a/apps/ios/Shared/Views/ChatList/UserPicker.swift b/apps/ios/Shared/Views/ChatList/UserPicker.swift
index 8cef6a064d..e9d3e6c9ab 100644
--- a/apps/ios/Shared/Views/ChatList/UserPicker.swift
+++ b/apps/ios/Shared/Views/ChatList/UserPicker.swift
@@ -12,7 +12,7 @@ struct UserPicker: View {
     @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
     @Environment(\.scenePhase) private var scenePhase: ScenePhase
     @Environment(\.colorScheme) private var colorScheme: ColorScheme
-    @Environment(\.dismiss) private var dismiss: DismissAction
+    @Binding var userPickerShown: Bool
     @Binding var activeSheet: UserPickerSheet?
     @State private var currentUser: Int64?
     @State private var switchingProfile = false
@@ -133,7 +133,7 @@ struct UserPicker: View {
         .clipShape(sectionShape)
         .onTapGesture {
             switchingProfile = true
-            dismiss()
+            userPickerShown = false
             Task {
                 do {
                     try await changeActiveUserAsync_(u.user.userId, viewPwd: nil)
@@ -181,6 +181,7 @@ struct UserPicker_Previews: PreviewProvider {
         let m = ChatModel()
         m.users = [UserInfo.sampleData, UserInfo.sampleData]
         return UserPicker(
+            userPickerShown: .constant(true),
             activeSheet: $activeSheet
         )
         .environmentObject(m)
diff --git a/apps/ios/Shared/Views/Helpers/SwiftUISheet.swift b/apps/ios/Shared/Views/Helpers/SwiftUISheet.swift
index f044ac0770..92f0bb6284 100644
--- a/apps/ios/Shared/Views/Helpers/SwiftUISheet.swift
+++ b/apps/ios/Shared/Views/Helpers/SwiftUISheet.swift
@@ -57,13 +57,6 @@ struct SwiftUISheet<SheetContent: View>: ViewModifier {
         .onChange(of: isPresented) { _ in animate() }
     }
 
-    private var bottomSafeAreaInset: Double {
-        if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
-           let window = windowScene.windows.first {
-            window.safeAreaInsets.bottom
-        } else { 0 }
-    }
-
     private func animate() {
         let newOffset: Double = isPresented ? 1 : 0
         let distance: Double = abs(newOffset - relativeOffset)