Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

packages/chat/src/components/input.tsx

@@ -27,6 +27,7 @@ import GifPicker from "./media/gifPicker";
 import ReplyBox from "./replyBox";
 import { useHotkey } from "@tensamin/hotkeys";
 import { editLastMessageHotkey } from "../hotkeys";
+import { useUser } from "@tensamin/identity/context";
 
 export default function InputComponent({
   value,
@@ -39,7 +40,8 @@ export default function InputComponent({
 }) {
   const [invertEnterBehavior, setInvertEnterBehavior] = useState(false);
 
-  const { send, sendSealedRelay } = useMTP();
+  const { sendSealedRelay } = useMTP();
+  const { getIota } = useUser();
   const {
     addLiveMessage,
     chatSecret,
@@ -176,12 +178,9 @@ export default function InputComponent({
 
     try {
       const [ownIota, peerIota] = await Promise.all([
-        send("GetIotaData", { UserId: ownId }),
-        send("GetIotaData", { UserId: userId }),
+        getIota(ownId),
+        getIota(userId),
       ]);
-      if (ownIota.type !== "GetIotaData" || peerIota.type !== "GetIotaData") {
-        throw new Error("Could not resolve an Iota for this message");
-      }
       const response = await sendSealedRelay(
         "MessageSend",
         {
@@ -191,15 +190,15 @@ export default function InputComponent({
           ...(replyTo && { ReplyId: replyTo }),
         },
         {
-          nextHop: { kind: "iota", id: ownIota.data.IotaId },
+          nextHop: { kind: "iota", id: ownIota.IotaId },
           finalRecipientId: userId,
           metadataRecipients: [
-            { value: ownIota.data.PublicKey, encoding: "base64" },
-            { value: peerIota.data.PublicKey, encoding: "base64" },
+            { value: ownIota.PublicKey, encoding: "base64" },
+            { value: peerIota.PublicKey, encoding: "base64" },
           ],
           contentRecipients: [
-            { value: ownIota.data.PublicKey, encoding: "base64" },
-            { value: peerIota.data.PublicKey, encoding: "base64" },
+            { value: ownIota.PublicKey, encoding: "base64" },
+            { value: peerIota.PublicKey, encoding: "base64" },
           ],
         },
       );

packages/chat/src/components/media/media.tsx

@@ -24,7 +24,7 @@ import {
 } from "lucide-react";
 import { useState, useMemo, useEffect, useRef, type WheelEvent } from "react";
 import MediaSaveButton from "./mediaSaveButton";
-import { useUserFields } from "@tensamin/user/context";
+import { useUserFields } from "@tensamin/identity/context";
 
 const zoomLevels = [1, 1.5, 2, 3];
 

packages/chat/src/components/message.tsx

@@ -1,7 +1,7 @@
 import type { RawMessage } from "../values";
 import { AlertTriangle, Check, CheckLine, RefreshCw } from "lucide-react";
 import { memo, useCallback, useEffect, useRef, useState } from "react";
-import { type SelectedUser, useUserFields } from "@tensamin/user/context";
+import { type SelectedUser, useUserFields } from "@tensamin/identity/context";
 
 import {
   Avatar,

packages/chat/src/components/replyBox.tsx

@@ -7,8 +7,8 @@ import {
   Skeleton,
 } from "@methanium/ui";
 import { Text } from "@methanium/ui/markdown";
-import type { SelectedUser } from "@tensamin/user/context";
-import Wrapper from "@tensamin/user/wrapper";
+import type { SelectedUser } from "@tensamin/identity/context";
+import Wrapper from "@tensamin/identity/wrapper";
 import { Forward, X } from "lucide-react";
 
 type ReplyUserData = SelectedUser<readonly ["Avatar", "Display"]>;