From f822a7a3449705825b4e82a6c89264be3475ebd9 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Tue, 28 Mar 2023 11:50:20 +0530
Subject: [PATCH] Wrap in feature flag

---
 src/domain/session/SessionViewModel.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/domain/session/SessionViewModel.js b/src/domain/session/SessionViewModel.js
index e0e77729..689f7c01 100644
--- a/src/domain/session/SessionViewModel.js
+++ b/src/domain/session/SessionViewModel.js
@@ -97,11 +97,14 @@ export class SessionViewModel extends ViewModel {
         }));
         this._updateJoinRoom(joinRoom.get());
 
+        if (this._client.session.features.crossSigning) {
+
         const verification = this.navigation.observe("device-verification");
-        this.track(verification.subscribe((txnId) => {
-            this._updateVerification(txnId);
-        }));
-        this._updateVerification(verification.get());
+            this.track(verification.subscribe((txnId) => {
+                this._updateVerification(txnId);
+            }));
+            this._updateVerification(verification.get());
+        }
 
         const lightbox = this.navigation.observe("lightbox");
         this.track(lightbox.subscribe(eventId => {