From 9bad471bf390752ed2f344d7d517c94582499ddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodolphe=20Br=C3=A9ard?= <v.code.ngyvz7vf@what.tf>
Date: Tue, 26 Sep 2023 14:12:52 +0200
Subject: [PATCH 1/2] Fix error message reset

---
 src/views/AddAccountView.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/AddAccountView.vue b/src/views/AddAccountView.vue
index 9570c01..d2baad0 100644
--- a/src/views/AddAccountView.vue
+++ b/src/views/AddAccountView.vue
@@ -150,9 +150,11 @@ const setErrorMessage = (messageId, messageType) => {
 	}
 	return true;
 };
-const resetErrorMessage = () => {
+const resetFloatingErrorMessage = () => {
 	errorMessageId.value = '';
-
+};
+const resetErrorMessage = () => {
+	resetFloatingErrorMessage();
 	separatorErrorMessageId.value = '';
 	localPartErrorMessageId.value = '';
 	addrKeyErrorMessageId.value = '';
@@ -165,7 +167,7 @@ const resetErrorMessage = () => {
 
 		<div class="alert alert-danger alert-dismissible fade show" role="alert" v-if="errorMessageId">
 			{{ $t(errorMessageId) }}
-			<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close" @click="resetErrorMessage"></button>
+			<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close" @click="resetFloatingErrorMessage"></button>
 		</div>
 
 		<div class="mb-3">

From 954eaad4461d4d818f116bd5fef92af6ed0e702a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodolphe=20Br=C3=A9ard?= <v.code.ngyvz7vf@what.tf>
Date: Tue, 26 Sep 2023 14:14:50 +0200
Subject: [PATCH 2/2] Put the QR code scanner in a modal

---
 src/locales/en.json          |  1 +
 src/locales/fr.json          |  1 +
 src/views/AddAccountView.vue | 31 ++++++++++++++++++++++++++++---
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 2a92660..78fe664 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -32,6 +32,7 @@
 		"domainName": "Domain name",
 		"privateKey": "Private key",
 		"scan": "Scan",
+		"scanTitle": "Scan a QR code",
 		"addAccount": "Add account",
 		"cancel": "@:invariants.controls.cancel",
 		"error": {
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 8791722..c6544e8 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -32,6 +32,7 @@
 		"domainName": "Nom de domaine",
 		"privateKey": "Clé privée",
 		"scan": "Scanner",
+		"scanTitle": "Scanner un QR code",
 		"addAccount": "Ajouter",
 		"cancel": "@:invariants.controls.cancel",
 		"error": {
diff --git a/src/views/AddAccountView.vue b/src/views/AddAccountView.vue
index d2baad0..e9f1af9 100644
--- a/src/views/AddAccountView.vue
+++ b/src/views/AddAccountView.vue
@@ -1,9 +1,10 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, reactive, computed, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
 import { useStorage } from '@vueuse/core';
 import { QrcodeStream, setZXingModuleOverrides } from 'vue-qrcode-reader';
 import { sha256 } from '@noble/hashes/sha256';
+import { Modal } from 'bootstrap';
 import base32Encode from 'base32-encode';
 import ButtonGroupComponent from '../components/ButtonGroupComponent.vue';
 import LayoutComponent from '../components/LayoutComponent.vue';
@@ -16,6 +17,9 @@ const separator = ref('+');
 const domainName = ref('');
 const privateKey = ref('');
 const authorizedKeyLengths = [16, 32];
+const state = reactive({
+	QrCodeModal: null,
+});
 
 const errorMessageId = ref('');
 const separatorErrorMessageId = ref('');
@@ -103,17 +107,26 @@ setZXingModuleOverrides({
 		return prefix + path;
 	},
 });
+onMounted(() => {
+	state.QrCodeModal = new Modal('#qr-code-modal', {});
+});
 const scanQrCode = ref(false);
 const showQrCodeScanner = (data) => {
+	state.QrCodeModal.show();
 	scanQrCode.value = true;
 };
+const hideQrCodeScanner = () => {
+	scanQrCode.value = false;
+	state.QrCodeModal.hide();
+};
 const onQrCodeDetected = (result_list) => {
 	if (result_list.length >= 1) {
 		privateKey.value = result_list[0].rawValue;
-		scanQrCode.value = false;
+		hideQrCodeScanner();
 	}
 };
 const onQrCodeError = (err) => {
+	hideQrCodeScanner();
 	if (err.name === 'NotAllowedError') {
 		setErrorMessage('addAccount.error.cameraNotAllowed');
 	} else if (err.name === 'NotFoundError') {
@@ -193,7 +206,19 @@ const resetErrorMessage = () => {
 			</div>
 		</div>
 
-		<qrcode-stream v-if="scanQrCode" @detect="onQrCodeDetected" @error="onQrCodeError"></qrcode-stream>
+		<div class="modal fade" id="qr-code-modal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+			<div class="modal-dialog">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h1 class="modal-title fs-5" id="staticBackdropLabel">{{ $t("addAccount.scanTitle") }}</h1>
+						<button type="button" class="btn-close" aria-label="Close" @click="hideQrCodeScanner"></button>
+					</div>
+					<div class="modal-body">
+						<qrcode-stream v-if="scanQrCode" @detect="onQrCodeDetected" @error="onQrCodeError"></qrcode-stream>
+					</div>
+				</div>
+			</div>
+		</div>
 
 		<ButtonGroupComponent>
 			<button type="button" class="btn btn-primary" :disabled="addDisabled" @click="addAccount">{{ $t("addAccount.addAccount") }}</button>