From 969e4149079af724da16c7388d035fa0c382e69a Mon Sep 17 00:00:00 2001
From: Revertron <r@revertron.com>
Date: Wed, 5 May 2021 11:50:00 +0200
Subject: [PATCH] Small fixes.

---
 src/web_ui.rs          | 13 ++++---------
 src/webview/index.html |  4 ++--
 src/webview/scripts.js |  4 ++--
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/web_ui.rs b/src/web_ui.rs
index 41c74fb..fe4ecc2 100644
--- a/src/web_ui.rs
+++ b/src/web_ui.rs
@@ -166,7 +166,7 @@ fn action_load_key(context: &Arc<Mutex<Context>>, web_view: &mut WebView<()>) {
                     event_fail(web_view, &format!("Error loading key from \\'{}\\'!", &file_name));
                 }
                 Some(keystore) => {
-                    info!("Loaded keystore with key: {:?}", &keystore);
+                    info!("Loaded keystore with keys: {:?}, {:?}", &keystore.get_public(), &keystore.get_encryption_public());
                     let mut c = context.lock().unwrap();
                     let path = keystore.get_path().to_owned();
                     let public = keystore.get_public().to_string();
@@ -389,15 +389,10 @@ fn action_create_domain(context: Arc<Mutex<Context>>, miner: Arc<Mutex<Miner>>,
             }
         }
     }
-    let signing = if !signing.is_empty() {
-        Bytes::new(from_hex(&signing).unwrap())
-    } else {
-        Bytes::default()
-    };
-    let encryption = if !encryption.is_empty() {
-        Bytes::new(from_hex(&encryption).unwrap())
+    let (signing, encryption) = if signing.is_empty() || encryption.is_empty() {
+        (keystore.get_public(), keystore.get_encryption_public())
     } else {
-        Bytes::default()
+        (Bytes::new(from_hex(&signing).unwrap()), Bytes::new(from_hex(&encryption).unwrap()))
     };
     match context.chain.can_mine_domain(context.chain.get_height(), &name, &pub_key) {
         MineResult::Fine => {
diff --git a/src/webview/index.html b/src/webview/index.html
index e583aaf..69e2fab 100644
--- a/src/webview/index.html
+++ b/src/webview/index.html
@@ -265,7 +265,7 @@
                 Just list your contacts, separated by new line.</p>
             <div class="buttons is-grouped is-centered">
                 <button class="button is-link" id="contacts_positive_button" onclick="contactsPositiveButton();">Ok</button>
-                <button class="button is-link is-light" id="contacts_negative_button" onclick="contactsCancelButton();">Cancel</button>
+                <button class="button is-link is-light" id="contacts_negative_button" onclick="contactsNegativeButton();">Cancel</button>
             </div>
         </div>
     </div>
@@ -284,7 +284,7 @@
             <p class="help mb-3">You can add some description to your domain if you wish for users or search engines to know what is it about.</p>
             <div class="buttons is-grouped is-centered">
                 <button class="button is-link" id="info_positive_button" onclick="infoPositiveButton();">Ok</button>
-                <button class="button is-link is-light" id="info_negative_button" onclick="infoCancelButton();">Cancel</button>
+                <button class="button is-link is-light" id="info_negative_button" onclick="infoNegativeButton();">Cancel</button>
             </div>
         </div>
     </div>
diff --git a/src/webview/scripts.js b/src/webview/scripts.js
index c276792..8860bf9 100644
--- a/src/webview/scripts.js
+++ b/src/webview/scripts.js
@@ -248,8 +248,8 @@ function createDomain() {
 function getContacts() {
     var result = [];
     var text = document.getElementById("contacts_text").value;
-    if (value != "") {
-        var lines = value.split("\n");
+    if (text != "") {
+        var lines = text.split("\n");
         lines.forEach(function(value, index, array) {
             result.push(value);
         });