From 53cce7598ca90375d36db25a7e5297bac0a5a5be Mon Sep 17 00:00:00 2001
From: Peter Harpending <peter@harpending.org>
Date: Mon, 18 Mar 2024 19:29:46 -0600
Subject: [PATCH] jr popup: separate modals for keypairs and recover keypair

---
 jrx/jex.eterms       |  1 +
 jrx/pages/popup.html | 25 +++++++++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/jrx/jex.eterms b/jrx/jex.eterms
index ba5d888..09bbc58 100644
--- a/jrx/jex.eterms
+++ b/jrx/jex.eterms
@@ -5,5 +5,6 @@
 {deps, ["local-tweetnacl-1.0.3",
         "local-awcp-0.2.3",
         "local-vdk_aecrypt-0.1.2",
+        "local-vdk_aertext-0.1.0",
         "local-vdk_aeser-0.1.1",
         "local-vdk_binary-0.1.0"]}.
diff --git a/jrx/pages/popup.html b/jrx/pages/popup.html
index 629bc32..d9205c0 100644
--- a/jrx/pages/popup.html
+++ b/jrx/pages/popup.html
@@ -22,7 +22,7 @@
     </tr>
 </table>
 
-<div style="margin-top: 5px; width: 95%; background: #d9ffd6; border: 1px solid #6c5d96; border-radius: 5px;">
+<div style="margin-top: 5px; width: 95%; background: #d9ffd6; border: 1px solid #6c5d96; border-radius: 5px; padding: 5px;">
     <table >
         <tr>
             <td><img src="../art/keypair.svg" style="width: 32px; height: 32px;"></td>
@@ -31,18 +31,35 @@
             </td>
         </tr>
     </table>
+
+    <!-- hidden if there are keypairs -->
     <p id="no-keypairs">You have no keypairs yet. Either generate a new one or
     recover one you already have.</p>
+
+    <!-- keypairs added dynamically from page script -->
     <ul id="keypairs"></ul>
-    <!-- recover from faert phrase -->
+
+    <!-- generate new keypair -->
     <form>
         <button id="generate-btn">Generate New Keypair</button>
     </form>
+</div>
+
+<!-- faert recovery -->
+<div style="margin-top: 5px; width: 95%; background: #ffd6d9; border: 1px solid #6c5d96; border-radius: 5px; padding: 5px;">
+    <table >
+        <tr>
+            <td><img src="../art/keypair.svg" style="width: 32px; height: 32px;"></td>
+            <td style="justify-content: center; font-size: 28px; text-align: center; font-weight: bold">
+                RECOVER KEYPAIR FROM GajuPhrase
+            </td>
+        </tr>
+    </table>
     <!-- recover from faert phrase -->
     <form>
-        <label for="faert-input">FÆRT Phrase:</label>
+        <label for="faert-input">GajuPhrase:</label>
         <input id="faert-input"></input>
-        <button id="faert-btn">Recover Keypair from FÆRT Phrase</button>
+        <button id="faert-btn">Recover Keypair from GajuPhrase</button>
     </form>
     <!-- recover from seed phrase
             <form>