From 3775569f48f63db2224dc2b98c2d8de0fd332bde Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Tue, 31 Jan 2023 19:07:32 +0000
Subject: [PATCH] Minor fixes.

- Marking a room as read on iPad.
- Potential state machine crash if you swipe to dismiss verification.
---
 ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift       | 2 +-
 .../SessionVerification/View/SessionVerificationScreen.swift    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
index 927fc0d35..108aaee9f 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
@@ -32,7 +32,7 @@ struct RoomScreen: View {
             .overlay { loadingIndicator }
             .alert(item: $context.alertInfo) { $0.alert }
             .sheet(item: $context.debugInfo) { DebugScreen(info: $0) }
-            .task {
+            .task(id: context.viewState.roomId) {
                 // Give a couple of seconds for items to load and to see them.
                 try? await Task.sleep(for: .seconds(2))
                 
diff --git a/ElementX/Sources/Screens/SessionVerification/View/SessionVerificationScreen.swift b/ElementX/Sources/Screens/SessionVerification/View/SessionVerificationScreen.swift
index aaf8dee04..915f42c1d 100644
--- a/ElementX/Sources/Screens/SessionVerification/View/SessionVerificationScreen.swift
+++ b/ElementX/Sources/Screens/SessionVerification/View/SessionVerificationScreen.swift
@@ -37,6 +37,7 @@ struct SessionVerificationScreen: View {
             .safeAreaInset(edge: .bottom) { actionButtons.padding() }
         }
         .navigationViewStyle(.stack)
+        .interactiveDismissDisabled() // Make sure dismissal goes through the state machine(s).
     }
     
     // MARK: - Private