From 4a707e94c99d0e74fb55271337f62904cf9a2d25 Mon Sep 17 00:00:00 2001
From: Niko PLP <niko@nextgraph.org>
Date: Sun, 14 Jul 2024 00:51:19 +0300
Subject: [PATCH] more fixes

---
 ng-app/src/locales/en.json           | 4 ++--
 ng-app/src/routes/ScanQR.svelte      | 4 ++--
 ng-app/src/routes/WalletLogin.svelte | 2 +-
 ng-app/src/styles.css                | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ng-app/src/locales/en.json b/ng-app/src/locales/en.json
index cca5d1f..b980199 100644
--- a/ng-app/src/locales/en.json
+++ b/ng-app/src/locales/en.json
@@ -245,7 +245,7 @@
     "wallet_login": {
       "select_wallet": "Select a wallet to login with",
       "from_import.title": "Your wallet has been transferred",
-      "from_import.description": "Your wallet has been received:",
+      "from_import.description": "Your wallet has been received from the other device!",
       "from_import.instruction": "To finish the import, please log in.",
       "with_another_wallet": "Log in with another wallet",
       "import_wallet": "Import your wallet",
@@ -273,7 +273,7 @@
       "login_btn": "Import with TextCode"
     },
     "scan_qr": {
-      "scanning": "Scan the QR-Code"
+      "scanning": "Scanning the QR-Code"
     }
   },
   "buttons": {
diff --git a/ng-app/src/routes/ScanQR.svelte b/ng-app/src/routes/ScanQR.svelte
index e083a36..eac5cbf 100644
--- a/ng-app/src/routes/ScanQR.svelte
+++ b/ng-app/src/routes/ScanQR.svelte
@@ -89,9 +89,9 @@
   <div>
     <h2 class="text-xl mb-6">{$t("pages.scan_qr.scanning")}</h2>
   </div>
-
+  <Spinner />
   <!-- Web Scanner -->
-  <div id="scanner-div"><Spinner /></div>
+  <div id="scanner-div"></div>
 
   <div class="mx-auto max-w-xs">
     <button
diff --git a/ng-app/src/routes/WalletLogin.svelte b/ng-app/src/routes/WalletLogin.svelte
index acd8975..f7a6cd3 100644
--- a/ng-app/src/routes/WalletLogin.svelte
+++ b/ng-app/src/routes/WalletLogin.svelte
@@ -278,7 +278,7 @@
 
       <div>
         <button
-          class="mt-4 text-primary-700 bg-primary-100 hover:bg-primary-100/90 focus:ring-4 focus:ring-primary-700/50 font-medium rounded-lg text-lg px-5 py-2.5 text-center inline-flex items-center justify-center dark:focus:ring-primary-100/55 mb-2"
+          class="mt-1 text-white bg-primary-700 hover:bg-primary-700/90 focus:ring-4 focus:ring-primary-100/50 font-medium rounded-lg text-lg px-5 py-2.5 text-center inline-flex items-center dark:focus:ring-primary-700/55 mb-2" 
           on:click={start_login_from_import}
         >
           {$t("buttons.login")}
diff --git a/ng-app/src/styles.css b/ng-app/src/styles.css
index 770ac48..a5bc566 100644
--- a/ng-app/src/styles.css
+++ b/ng-app/src/styles.css
@@ -16,7 +16,7 @@
 }
 
 /* TODO: hide qr scanner and info button */
-/* #scanner-div {
+#scanner-div {
     border: none !important;
 }
 #scanner-div * {
@@ -39,7 +39,7 @@
 }
 [alt="Info icon"] {
     display: none !important;
-} */
+}
 
 .logo {
     padding: 1.5em;