Event signing dialog shows user pubkey

src-tauri/src/main.rs

@@ -11,8 +11,7 @@ use nip_55::KeyManager;
 use nostr_sdk::key::SecretKey;
 use nostr_sdk::nips::nip46;
 use nostr_sdk::secp256k1::{Keypair, Secp256k1};
-use nostr_sdk::PublicKey;
-use nostr_sdk::{EventId, FromBech32};
+use nostr_sdk::{EventId, FromBech32, PublicKey, ToBech32};
 use std::collections::HashMap;
 use std::sync::Arc;
 use tauri::Manager;
@@ -120,7 +119,7 @@ impl Nip46RequestApprover for KeystacheRequestApprover {
     ) -> Nip46RequestApproval {
         // TODO: IMPORTANT!!! Currently we ignore all but the first request. We should handle all requests.
         // TODO: We should use `_user_pubkey` and pass it to the frontend.
-        let (request, _user_pubkey) = match requests.into_iter().next() {
+        let (request, user_pubkey) = match requests.into_iter().next() {
             Some(request) => request,
             None => return Nip46RequestApproval::Reject,
         };
@@ -150,7 +149,10 @@ impl Nip46RequestApprover for KeystacheRequestApprover {
 
         if self
             .app_handle
-            .emit_all("sign_event_request", event.clone())
+            .emit_all(
+                "sign_event_request",
+                (event, user_pubkey.to_bech32().unwrap()),
+            )
             .is_err()
         {
             return Nip46RequestApproval::Reject;

src/pages/HomePage.tsx

@@ -20,6 +20,7 @@ import { type PayInvoiceResponse, type UnsignedNostrEvent } from "~/types";
 const HomePage = () => {
   const [open, setOpen] = useState(false);
   const [event, setEvent] = useState<UnsignedNostrEvent | undefined>(undefined);
+  const [userPubkey, setUserPubkey] = useState<string | undefined>(undefined);
   const [invoice, setInvoice] = useState<string | undefined>(undefined);
   const [pubkey, setPubkey] = useState<string | undefined | null>(undefined);
   const resolveRejectRef = useRef<{
@@ -50,15 +51,14 @@ const HomePage = () => {
   }, []);
 
   useEffect(() => {
-    const handleEvent = (event: UnsignedNostrEvent): Promise<boolean> => {
+    return handleSignEventRequests((event, userPubkey): Promise<boolean> => {
       setEvent(event);
+      setUserPubkey(userPubkey);
       setOpen(true);
       return new Promise((resolve, reject) => {
         resolveRejectRef.current = { resolve, reject };
       });
-    };
-
-    return handleSignEventRequests(handleEvent);
+    });
   }, []);
 
   useEffect(() => {
@@ -107,13 +107,17 @@ const HomePage = () => {
       </div>
 
       <Dialog open={open} onOpenChange={setOpen}>
-        <DialogContent className="h-[20rem] max-w-[22rem]">
+        <DialogContent className="max-h-[30rem] max-w-[22rem]">
           <DialogHeader>
             <DialogTitle>Sign Event?</DialogTitle>
           </DialogHeader>
           <div className="overflow-auto bg-muted">
             <pre>{JSON.stringify(event, null, 2) ?? ""}</pre>
           </div>
+          As User
+          <div className="overflow-auto bg-muted">
+            {userPubkey}
+          </div>
           <DialogFooter>
             <div className="flex justify-end gap-x-4">
               <Button onClick={handleAccept}>Accept</Button>

src/tauriCommands.ts

@@ -80,18 +80,18 @@ export const setNsec = async (nsec: string): Promise<void> => {
 }
 
 type SignEventRequestHandler = (
-  event: UnsignedNostrEvent,
+  event: UnsignedNostrEvent, userPubkey: string
 ) => Promise<boolean> | boolean;
 
-listen("sign_event_request", async (event: Event<UnsignedNostrEvent>) => {
+listen("sign_event_request", async (event: Event<[UnsignedNostrEvent, string]>) => {
   let isApproved = false;
   for (const handler of Object.values(signEventRequestHandlers)) {
-    isApproved = await handler(event.payload);
+    isApproved = await handler(...event.payload);
     if (isApproved) {
       break;
     }
   }
-  respondToSignEventRequest(event.payload.id, isApproved);
+  respondToSignEventRequest(event.payload[0].id, isApproved);
 })
   .then((unlisten) => {
     // When vite reloads, a new event listener is created, so we need to unlisten to the old one.