diff --git a/js/nostr/nip46Client.js b/js/nostr/nip46Client.js
index 669f00cf..4b8f8d1d 100644
--- a/js/nostr/nip46Client.js
+++ b/js/nostr/nip46Client.js
@@ -1054,7 +1054,18 @@ function resolveAvailableNip46Ciphers(
     typeof nip44v2GetConversationKey === "function"
   ) {
     registerCipher("nip44.v2", () => {
-      const conversationKey = nip44v2GetConversationKey(privateKey, remotePubkey);
+      // Ensure keys are Uint8Array if available, falling back to string if not.
+      // nostr-tools v2 generally expects Uint8Array for keys in encryption helpers.
+      const privKeyInput =
+        typeof privateKey === "string" && tools?.utils?.hexToBytes
+          ? tools.utils.hexToBytes(privateKey)
+          : privateKey;
+      const pubKeyInput =
+        typeof remotePubkey === "string" && tools?.utils?.hexToBytes
+          ? tools.utils.hexToBytes(remotePubkey)
+          : remotePubkey;
+
+      const conversationKey = nip44v2GetConversationKey(privKeyInput, pubKeyInput);
 
       if (!conversationKey) {
         throw new Error("Failed to derive a nip44 conversation key for remote signing.");
diff --git a/js/ui/components/RevertModal.js b/js/ui/components/RevertModal.js
index ac7c5fdb..84120786 100644
--- a/js/ui/components/RevertModal.js
+++ b/js/ui/components/RevertModal.js
@@ -1,4 +1,3 @@
-import { getDTagValueFromTags } from "../../nostr/nip71.js";
 import { Nip71FormManager } from "./nip71FormManager.js";
 import { createModalAccessibility } from "./modalAccessibility.js";
 import { getDTagValueFromTags } from "../../nostr/nip71.js";
@@ -615,7 +614,6 @@ export class RevertModal {
     const dTagValue = getDTagValueFromTags(version.tags);
 
     const nip71Metadata = this.buildNip71DisplayMetadata(version);
-    const dTagValue = getDTagValueFromTags(version.tags);
 
     const utils = {
       formatAbsoluteTimestamp: this.formatAbsoluteTimestamp,
diff --git a/js/ui/components/VideoModal.js b/js/ui/components/VideoModal.js
index dd32fbaa..f3971034 100644
--- a/js/ui/components/VideoModal.js
+++ b/js/ui/components/VideoModal.js
@@ -2927,4 +2927,90 @@ export class VideoModal {
       this.refreshModalMoreMenuPanel();
     }
   }
+
+  handleCopyRequest() {
+    this.dispatch("action:copy", { video: this.activeVideo });
+  }
+
+  handleShareRequest() {
+    this.dispatch("action:share", { video: this.activeVideo });
+  }
+
+  handleEmbedRequest() {
+    this.dispatch("action:embed", { video: this.activeVideo });
+  }
+
+  handleCreatorNavigation() {
+    if (this.activeVideo?.pubkey) {
+      this.dispatch("navigate:profile", { pubkey: this.activeVideo.pubkey });
+    }
+  }
+
+  handleModalMoreButtonClick(event) {
+    // Basic stub to prevent crash
+    this.log("[VideoModal] More button clicked");
+  }
+
+  handleReactionClick(reaction) {
+    if (this.reactionsController) {
+      this.reactionsController.handleReaction(reaction);
+    }
+  }
+
+  bindVideoEvents() {
+    // Stub
+  }
+
+  detachVideoEvents() {
+    // Stub
+  }
+
+  bindActionButtons() {
+    if (this.copyMagnetBtn) {
+      this.copyMagnetBtn.addEventListener("click", this.handleCopyRequest);
+    }
+    if (this.shareBtn) {
+      this.shareBtn.addEventListener("click", this.handleShareRequest);
+    }
+    if (this.embedBtn) {
+      this.embedBtn.addEventListener("click", this.handleEmbedRequest);
+    }
+    if (this.creatorAvatar) {
+      this.creatorAvatar.addEventListener("click", this.handleCreatorNavigation);
+    }
+    if (this.creatorName) {
+      this.creatorName.addEventListener("click", this.handleCreatorNavigation);
+    }
+    if (this.modalMoreBtn) {
+      this.modalMoreBtn.addEventListener("click", this.handleModalMoreButtonClick);
+    }
+  }
+
+  updateSourceToggleState(source) {
+    // Stub
+  }
+
+  updateSourceAvailability(video) {
+    // Stub
+  }
+
+  attachAmbientGlow() {
+    // Stub
+  }
+
+  teardownAmbientGlow() {
+    // Stub
+  }
+
+  setupModalMorePopover() {
+    // Stub
+  }
+
+  setupModalSharePopover() {
+    // Stub
+  }
+
+  refreshModalMoreMenuPanel() {
+    // Stub
+  }
 }
diff --git a/tests/compliance/nip04_44_compliance.test.mjs b/tests/compliance/nip04_44_compliance.test.mjs
index b31f6ca0..b2ec3e78 100644
--- a/tests/compliance/nip04_44_compliance.test.mjs
+++ b/tests/compliance/nip04_44_compliance.test.mjs
@@ -33,6 +33,15 @@ test('NIP-04/44 Compliance: Encryption Preference', async (t) => {
   };
 
   await t.test('createNip46Cipher prefers nip44.v2 when available', async () => {
+    // Add getConversationKey mock for v2
+    toolsMock.nip44.v2 = {
+        utils: {
+            getConversationKey: () => 'mock-conversation-key'
+        },
+        encrypt: () => 'base64ciphertext',
+        decrypt: () => 'plaintext'
+    };
+
     const cipher = createNip46Cipher(toolsMock, privateKeyHex, remotePubkeyHex);
     assert.equal(cipher.algorithm, 'nip44.v2');
 
diff --git a/tests/nostr/dm-direct-message-flow.test.mjs b/tests/nostr/dm-direct-message-flow.test.mjs
index 25759eeb..9efcb316 100644
--- a/tests/nostr/dm-direct-message-flow.test.mjs
+++ b/tests/nostr/dm-direct-message-flow.test.mjs
@@ -151,14 +151,14 @@ async function setupDmScenario() {
   const senderPrivateKey = nostrTools.utils.bytesToHex(senderSecret);
   const receiverPrivateKey = nostrTools.utils.bytesToHex(receiverSecret);
 
-  const senderPubkey = nostrTools.getPublicKey(senderPrivateKey);
-  const receiverPubkey = nostrTools.getPublicKey(receiverPrivateKey);
+  const senderPubkey = nostrTools.getPublicKey(senderSecret);
+  const receiverPubkey = nostrTools.getPublicKey(receiverSecret);
 
-  const createSigner = (privateKey, pubkey) => ({
+  const createSigner = (privateKey, pubkey, secret) => ({
     type: "test",
     pubkey,
     signEvent: (event) => {
-      const finalized = nostrTools.finalizeEvent(event, privateKey);
+      const finalized = nostrTools.finalizeEvent(event, secret);
       return { ...event, id: finalized.id, sig: finalized.sig };
     },
     nip04Encrypt: (target, plaintext) =>
@@ -167,8 +167,8 @@ async function setupDmScenario() {
       nostrTools.nip04.decrypt(privateKey, target, ciphertext),
   });
 
-  const senderSigner = createSigner(senderPrivateKey, senderPubkey);
-  const receiverSigner = createSigner(receiverPrivateKey, receiverPubkey);
+  const senderSigner = createSigner(senderPrivateKey, senderPubkey, senderSecret);
+  const receiverSigner = createSigner(receiverPrivateKey, receiverPubkey, receiverSecret);
 
   const relayPool = new FakeRelayPool();