From 5610cde131a52741a39cfed4e55542e7d957c273 Mon Sep 17 00:00:00 2001
From: Niko <niko@nobigtech.es>
Date: Wed, 2 Mar 2022 18:57:11 +0100
Subject: [PATCH] Fix crush discard confirmation when Accepted + some UI fixes

---
 web/src/app/css/base.css     | 1 +
 web/src/app/js/app.js        | 5 +++++
 web/src/app/js/pages/meet.js | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/web/src/app/css/base.css b/web/src/app/css/base.css
index 653f847..0dc8ec1 100644
--- a/web/src/app/css/base.css
+++ b/web/src/app/css/base.css
@@ -41,6 +41,7 @@ body {
 	bottom: 0;
 	width: 100%;
 	height: 100%;
+	z-index: 100;
 }
 .overlay.dark {
 	background: #040404c2;
diff --git a/web/src/app/js/app.js b/web/src/app/js/app.js
index 3c76bcd..5774721 100644
--- a/web/src/app/js/app.js
+++ b/web/src/app/js/app.js
@@ -520,6 +520,11 @@ app.preload = {
 			'home.quiz_item',
 		]);
 	},
+	meet: function() {
+		app.template.loadMany([
+			'overlay.view_image',
+		]);
+	},
 	quiz: function() {
 		app.script('pages.quiz');
 		app.template.loadMany([
diff --git a/web/src/app/js/pages/meet.js b/web/src/app/js/pages/meet.js
index a20bb58..5ef6f6a 100644
--- a/web/src/app/js/pages/meet.js
+++ b/web/src/app/js/pages/meet.js
@@ -26,6 +26,7 @@ app.pages.meet = {
 				});
 			}
 			app.preload.home();
+			app.preload.meet();
 		});
 	},
 	loadMore: function() {
@@ -182,7 +183,7 @@ app.pages.meet = {
 			if (current === undefined || current === null)
 				return app.toast.error(s('app.error.unknown_error'));
 
-			if (typeof current.quiz_id !== 'string' &&
+			if (typeof current.quiz_id === 'string' &&
 				!await app.toast.warnConfirm(s('app.confirm.crush_discard')))
 				return false;