From d2708508c9dd9d5961489c8c376943545706d9fb Mon Sep 17 00:00:00 2001
From: Believethehype <tobias_baur@yahoo.com>
Date: Wed, 31 Jan 2024 20:22:37 +0100
Subject: [PATCH] minor adjustments/fixes

---
 ui/noogle/src/components/Image.vue   |  2 +-
 ui/noogle/src/components/Newnote.vue |  1 -
 ui/noogle/src/components/Nip07.vue   | 28 ++++++++++++++++++++++++----
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/ui/noogle/src/components/Image.vue b/ui/noogle/src/components/Image.vue
index a8d6e4f..0e024c1 100644
--- a/ui/noogle/src/components/Image.vue
+++ b/ui/noogle/src/components/Image.vue
@@ -5,7 +5,7 @@ import Donate from "@/components/Donate.vue";
 
 export default {
   name: "Home",
-  components: {Donate, Nip07, ResultsTable, ImageGeneration}
+  components: {Donate, Nip07, ImageGeneration}
 }
 </script>
 
diff --git a/ui/noogle/src/components/Newnote.vue b/ui/noogle/src/components/Newnote.vue
index 21c9843..aed575a 100644
--- a/ui/noogle/src/components/Newnote.vue
+++ b/ui/noogle/src/components/Newnote.vue
@@ -50,7 +50,6 @@ onClickOutside(target, ()=>emit('modal-close'))
   width: 400px;
   margin: 200px auto;
   padding: 20px 30px;
-  //background-color: #181818;
   border-radius: 2px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.33);
 }
diff --git a/ui/noogle/src/components/Nip07.vue b/ui/noogle/src/components/Nip07.vue
index 5c459ea..94b0657 100644
--- a/ui/noogle/src/components/Nip07.vue
+++ b/ui/noogle/src/components/Nip07.vue
@@ -32,7 +32,7 @@
       <div tabIndex={0} className="dropdown-content -start-44 z-[1] horizontal card card-compact w-64 p-2 shadow bg-primary text-primary-content">
         <div className="card-body">
           <h3 className="card-title">Nip07 Login</h3>
-          <p>Use a Browser Nip07 Extension like getalby or nos2x to login</p>
+          <p>Use a Browser Nip07 Extension like getalby or nos2x to login or use Amber on Android</p>
          <button className="btn" @click="sign_in_nip07()">Browser Extension</button>
          <template v-if="supports_android_signer">
           <button className="btn" @click="sign_in_amber()">Amber Sign in</button>
@@ -89,6 +89,15 @@ export default {
         {
            await this.sign_in_nip07()
         }
+
+        else  if (localStorage.getItem('nostr-key-method') === 'android-signer')
+        {
+          let key = ""
+          if (localStorage.getItem('nostr-key') !== ""){
+            key = localStorage.getItem('nostr-key')
+          }
+          await this.sign_in_amber(key)
+        }
         else {
           await this.sign_in_anon()
         }
@@ -220,7 +229,7 @@ export default {
         console.log(error);
       }
     },
-    async sign_in_amber() {
+    async sign_in_amber(key="") {
       try {
 
         await loadWasmAsync();
@@ -238,7 +247,14 @@ export default {
           return;
         }
 
-        const hexKey = await amberSignerService.getPublicKey();
+        try{
+        let hexKey = ""
+        if (key === ""){
+            hexKey = await amberSignerService.getPublicKey();
+        }
+        else{
+          hexKey = key
+        }
         let publicKey = PublicKey.fromHex(hexKey);
         let keys = Keys.fromPublicKey(publicKey)
         this.signer = ClientSigner.keys(keys)
@@ -252,8 +268,12 @@ export default {
         store.commit('set_pubkey', publicKey)
         store.commit('set_hasEventListener', false)
         localStorage.setItem('nostr-key-method', "android-signer")
-        localStorage.setItem('nostr-key', "")
+        localStorage.setItem('nostr-key', hexKey)
         await this.get_user_info(publicKey)
+                }
+        catch (error){
+          alert(error)
+        }
 
         //miniToastr.showMessage("Login successful!", "Logged in as " + publicKey.toHex(), VueNotifications.types.success)