Merge remote-tracking branch 'refs/remotes/origin/main'

Genti2024 · Nov 1, 2024 · 1c6d12f · 1c6d12f
2 parents aaa4979 + b0e44d8
commit 1c6d12f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/Genti_iOS/Genti_iOS/Application/Router/Router.swift b/Genti_iOS/Genti_iOS/Application/Router/Router.swift
@@ -42,6 +42,10 @@ final class Router<Destination: Route> {
         isPresented.wrappedValue = nil
     }
 
+    public func dismissFullScreenCover() {
+        self.presentingFullScreenCover = nil
+    }
+
     public func dismissFullScreenCover(_ handler: @escaping () -> Void) {
         if let _ = self.presentingFullScreenCover {
             self.presentingFullScreenCover = nil

diff --git a/Genti_iOS/Genti_iOS/Presentation/TabView/ViewModel/TabViewModel.swift b/Genti_iOS/Genti_iOS/Presentation/TabView/ViewModel/TabViewModel.swift
@@ -60,7 +60,10 @@ final class TabViewModel: ViewModel {
                     }
                 case .disagree:
                     userdefaultRepository.setOpenChatAgreement(isAgree: false)
+                    self.router.dismissFullScreenCover()
                 }
+            } else {
+                self.router.dismissFullScreenCover()
             }
         } catch(let error) {
             self.handleError(error)