From d0049b525752fd0670c1062293ee2674dc5f5738 Mon Sep 17 00:00:00 2001
From: Luka Trovic <luka@nextcloud.com>
Date: Fri, 16 Jun 2023 09:10:21 +0200
Subject: [PATCH 1/2] fix: open card in modal on main route

Signed-off-by: Luka Trovic <luka@nextcloud.com>
---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index fbfa0eb0c..f4de9eaaf 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -37,7 +37,7 @@
 			</div>
 		</NcModal>
 
-		<router-view name="sidebar" :visible="!cardDetailsInModal || !$route.params.cardId" />
+		<router-view v-if="!cardDetailsInModal" name="sidebar" />
 	</NcContent>
 </template>
 

From bcefc2a36c07f4022a03cffd09698a1211e5cac1 Mon Sep 17 00:00:00 2001
From: Luka Trovic <luka@nextcloud.com>
Date: Fri, 16 Jun 2023 19:09:09 +0200
Subject: [PATCH 2/2] fix: cypress issue

Signed-off-by: Luka Trovic <luka@nextcloud.com>
---
 src/App.vue | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index f4de9eaaf..920bf4a3f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,17 +27,19 @@
 			<router-view />
 		</NcAppContent>
 
-		<NcModal v-if="cardDetailsInModal && $route.params.cardId"
-			:clear-view-delay="0"
-			:close-button-contained="true"
-			size="large"
-			@close="hideModal()">
-			<div class="modal__content modal__card">
-				<router-view name="sidebar" />
-			</div>
-		</NcModal>
+		<div v-if="$route.params.id || $route.params.cardId">
+			<NcModal v-if="cardDetailsInModal && $route.params.cardId"
+				:clear-view-delay="0"
+				:close-button-contained="true"
+				size="large"
+				@close="hideModal()">
+				<div class="modal__content modal__card">
+					<router-view name="sidebar" />
+				</div>
+			</NcModal>
 
-		<router-view v-if="!cardDetailsInModal" name="sidebar" />
+			<router-view name="sidebar" :visible="!cardDetailsInModal || !$route.params.cardId" />
+		</div>
 	</NcContent>
 </template>