From 04f10aede78a3bc2578da333198534b6fb081670 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Sat, 3 Dec 2022 21:42:12 +0000
Subject: [PATCH] ios: fix screen protection in sheets, remove screen
 protection from settings and image pickers (#1492)

---
 apps/ios/Shared/ContentView.swift                           | 2 +-
 apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift | 2 +-
 apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift     | 2 +-
 apps/ios/Shared/Views/NewChat/AddGroupView.swift            | 2 +-
 apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift          | 2 +-
 apps/ios/Shared/Views/UserSettings/SMPServersView.swift     | 2 +-
 apps/ios/Shared/Views/UserSettings/SettingsButton.swift     | 2 +-
 apps/ios/Shared/Views/UserSettings/UserProfile.swift        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/ios/Shared/ContentView.swift b/apps/ios/Shared/ContentView.swift
index 913952358..26e9e953c 100644
--- a/apps/ios/Shared/ContentView.swift
+++ b/apps/ios/Shared/ContentView.swift
@@ -76,9 +76,9 @@ struct ContentView: View {
             userAuthorized = true
         } else {
             dismissAllSheets(animated: false) {
+                chatModel.chatId = nil
                 justAuthenticate()
             }
-            chatModel.chatId = nil
         }
     }
 
diff --git a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift
index e237737f0..019a42fd8 100644
--- a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift
+++ b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift
@@ -246,7 +246,7 @@ struct ComposeView: View {
                 CameraImageListPicker(images: $chosenImages)
             }
         }
-        .appSheet(isPresented: $showImagePicker) {
+        .sheet(isPresented: $showImagePicker) {
             LibraryImageListPicker(images: $chosenImages, selectionLimit: 10) { itemsSelected in
                 showImagePicker = false
                 if itemsSelected {
diff --git a/apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift b/apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift
index 88c0f52e0..32adf861f 100644
--- a/apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift
+++ b/apps/ios/Shared/Views/Chat/Group/GroupProfileView.swift
@@ -82,7 +82,7 @@ struct GroupProfileView: View {
                 CameraImagePicker(image: $chosenImage)
             }
         }
-        .appSheet(isPresented: $showImagePicker) {
+        .sheet(isPresented: $showImagePicker) {
             LibraryImagePicker(image: $chosenImage) {
                 didSelectItem in showImagePicker = false
             }
diff --git a/apps/ios/Shared/Views/NewChat/AddGroupView.swift b/apps/ios/Shared/Views/NewChat/AddGroupView.swift
index 2f1491e77..ed4e82c0e 100644
--- a/apps/ios/Shared/Views/NewChat/AddGroupView.swift
+++ b/apps/ios/Shared/Views/NewChat/AddGroupView.swift
@@ -136,7 +136,7 @@ struct AddGroupView: View {
                 CameraImagePicker(image: $chosenImage)
             }
         }
-        .appSheet(isPresented: $showImagePicker) {
+        .sheet(isPresented: $showImagePicker) {
             LibraryImagePicker(image: $chosenImage) {
                 didSelectItem in showImagePicker = false
             }
diff --git a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift
index d93cf81aa..cdd5f0ce9 100644
--- a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift
+++ b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift
@@ -53,7 +53,7 @@ struct SimpleXInfo: View {
                 .padding(.bottom, 8)
                 .frame(maxWidth: .infinity)
             }
-            .appSheet(isPresented: $showHowItWorks) {
+            .sheet(isPresented: $showHowItWorks) {
                 HowItWorks(onboarding: onboarding)
             }
         }
diff --git a/apps/ios/Shared/Views/UserSettings/SMPServersView.swift b/apps/ios/Shared/Views/UserSettings/SMPServersView.swift
index 42615ed69..372c5bb34 100644
--- a/apps/ios/Shared/Views/UserSettings/SMPServersView.swift
+++ b/apps/ios/Shared/Views/UserSettings/SMPServersView.swift
@@ -79,7 +79,7 @@ struct SMPServersView: View {
             Button("Add preset servers", action: addAllPresets)
                 .disabled(hasAllPresets())
         }
-        .appSheet(isPresented: $showScanSMPServer) {
+        .sheet(isPresented: $showScanSMPServer) {
             ScanSMPServer(servers: $servers)
         }
         .alert(item: $alert) { a in
diff --git a/apps/ios/Shared/Views/UserSettings/SettingsButton.swift b/apps/ios/Shared/Views/UserSettings/SettingsButton.swift
index 7e53fe29c..7292fd437 100644
--- a/apps/ios/Shared/Views/UserSettings/SettingsButton.swift
+++ b/apps/ios/Shared/Views/UserSettings/SettingsButton.swift
@@ -16,7 +16,7 @@ struct SettingsButton: View {
         Button { showSettings = true } label: {
             Image(systemName: "gearshape")
         }
-        .appSheet(isPresented: $showSettings, content: {
+        .sheet(isPresented: $showSettings, content: {
             SettingsView(showSettings: $showSettings)
         })
     }
diff --git a/apps/ios/Shared/Views/UserSettings/UserProfile.swift b/apps/ios/Shared/Views/UserSettings/UserProfile.swift
index ad275cf4d..de7a19c8b 100644
--- a/apps/ios/Shared/Views/UserSettings/UserProfile.swift
+++ b/apps/ios/Shared/Views/UserSettings/UserProfile.swift
@@ -100,7 +100,7 @@ struct UserProfile: View {
                 CameraImagePicker(image: $chosenImage)
             }
         }
-        .appSheet(isPresented: $showImagePicker) {
+        .sheet(isPresented: $showImagePicker) {
             LibraryImagePicker(image: $chosenImage) {
                 didSelectItem in showImagePicker = false
             }