refactor for no reason

MutinyWallet · Jan 30, 2024 · ea7179c · ea7179c
1 parent 80dd622
commit ea7179c
Showing 1 changed file with 45 additions and 37 deletions.
diff --git a/src/routes/Chat.tsx b/src/routes/Chat.tsx
@@ -1,7 +1,13 @@
 /* refresh skip */
 
 import { TagItem } from "@mutinywallet/mutiny-wasm";
-import { useNavigate, useParams } from "@solidjs/router";
+import {
+    cache,
+    createAsync,
+    revalidate,
+    useNavigate,
+    useParams
+} from "@solidjs/router";
 import {
     createEffect,
     createResource,
@@ -57,39 +63,44 @@ function SingleMessage(props: {
     const network = state.mutiny_wallet?.get_network() || "signet";
     const navigate = useNavigate();
 
-    const [parsed] = createResource(async () => {
-        const result = toParsedParams(props.dm.message, network);
+    const parsed = createAsync(
+        async () => {
+            const result = toParsedParams(props.dm.message, network);
 
-        if (!result.ok) {
-            return undefined;
-        }
+            if (!result.ok) {
+                return undefined;
+            }
 
-        if (result.value?.invoice) {
-            try {
-                const alreadyPaid = await state.mutiny_wallet?.get_invoice(
-                    result.value.invoice
-                );
-                if (alreadyPaid?.paid) {
-                    return {
-                        type: "invoice",
-                        status: "paid",
-                        value: result.value.invoice,
-                        amount: result.value.amount_sats
-                    };
+            if (result.value?.invoice) {
+                try {
+                    const alreadyPaid = await state.mutiny_wallet?.get_invoice(
+                        result.value.invoice
+                    );
+                    if (alreadyPaid?.paid) {
+                        return {
+                            type: "invoice",
+                            status: "paid",
+                            value: result.value.invoice,
+                            amount: result.value.amount_sats
+                        };
+                    }
+                } catch (e) {
+                    // No invoice found, no worries
                 }
-            } catch (e) {
-                // No invoice found, no worries
-            }
 
-            return {
-                type: "invoice",
-                status: "unpaid",
-                from: props.dm.from,
-                value: result.value.invoice,
-                amount: result.value.amount_sats
-            };
+                return {
+                    type: "invoice",
+                    status: "unpaid",
+                    from: props.dm.from,
+                    value: result.value.invoice,
+                    amount: result.value.amount_sats
+                };
+            }
+        },
+        {
+            initialValue: undefined
         }
-    });
+    );
 
     function navWithContactId() {
         navigate("/send", {
@@ -178,8 +189,8 @@ export function Chat() {
     const [messageValue, setMessageValue] = createSignal("");
     const [sending, setSending] = createSignal(false);
 
-    const [contact] = createResource(async () => {
-        return await state.mutiny_wallet?.get_tag_item(params.id);
+    const contact = createAsync(async () => {
+        return state.mutiny_wallet?.get_tag_item(params.id);
     });
 
     const [convo, { refetch }] = createResource(
@@ -237,18 +248,15 @@ export function Chat() {
                     return b_time - a_time;
                 });
 
-                return combined as CombinedMessagesAndActivity[];
+                return combined.reverse() as CombinedMessagesAndActivity[];
 
                 // return combined as FakeDirectMessage[];
                 return [];
             } catch (e) {
                 console.error("error getting convo:", e);
-                return undefined;
+                return [];
             }
         }
-        // {
-        //     storage: createDeepSignal
-        // }
     );
 
     async function sendMessage() {
@@ -407,7 +415,7 @@ export function Chat() {
                             <Suspense>
                                 <Show when={contact()}>
                                     <Suspense fallback={<LoadingShimmer />}>
-                                        <For each={convo.latest?.reverse()}>
+                                        <For each={convo.latest}>
                                             {(combined) => (
                                                 <>
                                                     <Show