Update headers

components/Accounts.tsx

@@ -116,16 +116,9 @@ export const AccountDialog = ({
                 <Text
                   css={{
                     fontFamily: "$monospace",
-                    a: { "&:hover": { textDecoration: "underline" } },
                   }}
                 >
-                  <a
+                  {activeAccount?.address}
-                    href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${activeAccount?.address}`}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                  >
-                    {activeAccount?.address}
-                  </a>
                 </Text>
               </Flex>
               <Flex css={{ marginLeft: "auto", color: "$mauve12" }}>
@@ -222,11 +215,7 @@ export const AccountDialog = ({
                   </Button>
                 </Text>
               </Flex>
-              <Flex
+              <Flex css={{ marginLeft: "auto" }}>
-                css={{
-                  marginLeft: "auto",
-                }}
-              >
                 <a
                   href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${activeAccount?.address}`}
                   target="_blank"
@@ -248,22 +237,10 @@ export const AccountDialog = ({
                 <Text
                   css={{
                     fontFamily: "$monospace",
-                    a: { "&:hover": { textDecoration: "underline" } },
                   }}
                 >
                   {activeAccount && activeAccount.hooks.length > 0
-                    ? activeAccount.hooks.map((i) => {
+                    ? activeAccount.hooks.map((i) => truncate(i, 12)).join(",")
-                        return (
-                          <a
-                            key={i}
-                            href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${i}`}
-                            target="_blank"
-                            rel="noopener noreferrer"
-                          >
-                            {truncate(i, 12)}
-                          </a>
-                        );
-                      })
                     : "–"}
                 </Text>
               </Flex>

components/DebugStream.tsx

@@ -1,7 +1,5 @@
-import { useEffect } from "react";
+import { useCallback, useEffect } from "react";
-import ReconnectingWebSocket, { CloseEvent } from "reconnecting-websocket";
 import { proxy, ref, useSnapshot } from "valtio";
-import { subscribeKey } from "valtio/utils";
 import { Select } from ".";
 import state, { ILog, transactionsState } from "../state";
 import { extractJSON } from "../utils/json";
@@ -17,7 +15,7 @@ export interface IStreamState {
   status: "idle" | "opened" | "closed";
   statusChangeTimestamp?: number;
   logs: ILog[];
-  socket?: ReconnectingWebSocket;
+  socket?: WebSocket;
 }
 
 export const streamState = proxy<IStreamState>({
@@ -26,85 +24,12 @@ export const streamState = proxy<IStreamState>({
   logs: [] as ILog[],
 });
 
-const onOpen = (account: ISelect | null) => {
-  if (!account) {
-    return;
-  }
-  // streamState.logs = [];
-  streamState.status = "opened";
-  streamState.statusChangeTimestamp = Date.now();
-
-  pushLog(`Debug stream opened for account ${account?.value}`, {
-    type: "success",
-  });
-};
-const onError = () => {
-  pushLog("Something went wrong! Check your connection and try again.", {
-    type: "error",
-  });
-};
-const onClose = (e: CloseEvent) => {
-  // 999 = closed websocket connection by switching account
-  if (e.code !== 4999) {
-    pushLog(`Connection was closed. [code: ${e.code}]`, {
-      type: "error",
-    });
-  }
-  streamState.status = "closed";
-  streamState.statusChangeTimestamp = Date.now();
-};
-const onMessage = (event: any) => {
-  // Ping returns just account address, if we get that
-  // response we don't need to log anything
-  if (event.data !== streamState.selectedAccount?.value) {
-    pushLog(event.data);
-  }
-};
-
-let interval: NodeJS.Timer | null = null;
-
-const addListeners = (account: ISelect | null) => {
-  if (account?.value && streamState.socket?.url.endsWith(account?.value)) {
-    return;
-  }
-  streamState.logs = [];
-  if (account?.value) {
-    if (interval) {
-      clearInterval(interval);
-    }
-    if (streamState.socket) {
-      streamState.socket?.removeEventListener("open", () => onOpen(account));
-      streamState.socket?.removeEventListener("close", onClose);
-      streamState.socket?.removeEventListener("error", onError);
-      streamState.socket?.removeEventListener("message", onMessage);
-    }
-
-    streamState.socket = ref(
-      new ReconnectingWebSocket(
-        `wss://${process.env.NEXT_PUBLIC_DEBUG_STREAM_URL}/${account?.value}`
-      )
-    );
-    if (streamState.socket) {
-      interval = setInterval(() => {
-        streamState.socket?.send("");
-      }, 10000);
-    }
-
-    streamState.socket.addEventListener("open", () => onOpen(account));
-    streamState.socket.addEventListener("close", onClose);
-    streamState.socket.addEventListener("error", onError);
-    streamState.socket.addEventListener("message", onMessage);
-  }
-};
-
-subscribeKey(streamState, "selectedAccount", addListeners);
-
 const DebugStream = () => {
-  const { selectedAccount, logs } = useSnapshot(streamState);
+  const { selectedAccount, logs, socket } = useSnapshot(streamState);
   const { activeHeader: activeTxTab } = useSnapshot(transactionsState);
   const { accounts } = useSnapshot(state);
 
-  const accountOptions = accounts.map((acc) => ({
+  const accountOptions = accounts.map(acc => ({
     label: acc.name,
     value: acc.address,
   }));
@@ -117,21 +42,117 @@ const DebugStream = () => {
         options={accountOptions}
         hideSelectedOptions
         value={selectedAccount}
-        onChange={(acc) => {
+        onChange={acc => (streamState.selectedAccount = acc as any)}
-          streamState.socket?.close(
-            4999,
-            "Old connection closed because user switched account"
-          );
-          streamState.selectedAccount = acc as any;
-        }}
         css={{ width: "100%" }}
       />
     </>
   );
 
+  useEffect(() => {
+    const account = selectedAccount?.value;
+    if (account && (!socket || !socket.url.endsWith(account))) {
+      socket?.close();
+      streamState.socket = ref(
+        new WebSocket(
+          `wss://${process.env.NEXT_PUBLIC_DEBUG_STREAM_URL}/${account}`
+        )
+      );
+    } else if (!account && socket) {
+      socket.close();
+      streamState.socket = undefined;
+    }
+  }, [selectedAccount?.value, socket]);
+
+  const onMount = useCallback(async () => {
+    // deliberately using `proxy` values and not the `useSnapshot` ones to have no dep list
+    const acc = streamState.selectedAccount;
+    const status = streamState.status;
+
+    if (status === "opened" && acc) {
+      // fetch the missing ones
+      try {
+        const url = `https://${process.env.NEXT_PUBLIC_DEBUG_STREAM_URL}/recent/${acc?.value}`;
+
+        // TODO Remove after api sets cors properly
+        const res = await fetch("/api/proxy", {
+          method: "POST",
+          body: JSON.stringify({ url }),
+          headers: {
+            "Content-Type": "application/json",
+          },
+        });
+
+        if (!res.ok) return;
+
+        const body = await res.json();
+
+        if (!body?.logs) return;
+
+        const start = streamState.statusChangeTimestamp || 0;
+        streamState.logs = [];
+        pushLog(`Debug stream opened for account ${acc.value}`, {
+          type: "success",
+        });
+
+        const logs = Object.entries(body.logs).filter(([tm]) => +tm >= start);
+
+        logs.forEach(([tm, log]) => pushLog(log));
+      } catch (error) {
+        console.error(error);
+      }
+    }
+  }, []);
+
+  useEffect(() => {
+    onMount();
+  }, [onMount]);
+
+  useEffect(() => {
+    const account = selectedAccount?.value;
+    const socket = streamState.socket;
+    if (!socket) return;
+
+    const onOpen = () => {
+      streamState.logs = [];
+      streamState.status = "opened";
+      streamState.statusChangeTimestamp = Date.now();
+      pushLog(`Debug stream opened for account ${account}`, {
+        type: "success",
+      });
+    };
+    const onError = () => {
+      pushLog("Something went wrong! Check your connection and try again.", {
+        type: "error",
+      });
+    };
+    const onClose = (e: CloseEvent) => {
+      pushLog(`Connection was closed. [code: ${e.code}]`, {
+        type: "error",
+      });
+      streamState.selectedAccount = null;
+      streamState.status = "closed";
+      streamState.statusChangeTimestamp = Date.now();
+    };
+    const onMessage = (event: any) => {
+      pushLog(event.data);
+    };
+
+    socket.addEventListener("open", onOpen);
+    socket.addEventListener("close", onClose);
+    socket.addEventListener("error", onError);
+    socket.addEventListener("message", onMessage);
+
+    return () => {
+      socket.removeEventListener("open", onOpen);
+      socket.removeEventListener("close", onClose);
+      socket.removeEventListener("message", onMessage);
+      socket.removeEventListener("error", onError);
+    };
+  }, [selectedAccount?.value, socket]);
+
   useEffect(() => {
     const account = transactionsState.transactions.find(
-      (tx) => tx.header === activeTxTab
+      tx => tx.header === activeTxTab
     )?.state.selectedAccount;
 
     if (account && account.value !== streamState.selectedAccount?.value)

components/EditorNavigation.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useCallback, useRef } from "react";
+import React, { useState, useEffect, useCallback } from "react";
 import {
   Plus,
   Share,
@@ -101,7 +101,7 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
       if (!filename) {
         return { error: "You need to add filename" };
       }
-      if (snap.files.find((file) => file.name === filename)) {
+      if (snap.files.find(file => file.name === filename)) {
         return { error: "Filename already exists." };
       }
 
@@ -132,55 +132,22 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
     createNewFile(filename);
     setFilename("");
   }, [filename, setIsNewfileDialogOpen, setFilename, validateFilename]);
-  const scrollRef = useRef<HTMLDivElement>(null);
+
-  const containerRef = useRef<HTMLDivElement>(null);
   const files = snap.files;
   return (
     <Flex css={{ flexShrink: 0, gap: "$0" }}>
       <Flex
-        id="kissa"
-        ref={scrollRef}
         css={{
           overflowX: "scroll",
-          overflowY: "hidden",
           py: "$3",
-          pb: "$0",
           flex: 1,
           "&::-webkit-scrollbar": {
-            height: "0.3em",
+            height: 0,
-            background: "rgba(0,0,0,.0)",
+            background: "transparent",
           },
-          "&::-webkit-scrollbar-gutter": "stable",
-          "&::-webkit-scrollbar-thumb": {
-            backgroundColor: "rgba(0,0,0,.2)",
-            outline: "0px",
-            borderRadius: "9999px",
-          },
-          scrollbarColor: "rgba(0,0,0,.2) rgba(0,0,0,0)",
-          scrollbarGutter: "stable",
-          scrollbarWidth: "thin",
-          ".dark &": {
-            "&::-webkit-scrollbar": {
-              background: "rgba(0,0,0,.0)",
-            },
-            "&::-webkit-scrollbar-gutter": "stable",
-            "&::-webkit-scrollbar-thumb": {
-              backgroundColor: "rgba(255,255,255,.2)",
-              outline: "0px",
-              borderRadius: "9999px",
-            },
-            scrollbarColor: "rgba(255,255,255,.2) rgba(0,0,0,0)",
-            scrollbarGutter: "stable",
-            scrollbarWidth: "thin",
-          },
-        }}
-        onWheelCapture={(e) => {
-          if (scrollRef.current) {
-            scrollRef.current.scrollLeft += e.deltaY;
-          }
         }}
       >
-        <Container css={{ flex: 1 }} ref={containerRef}>
+        <Container css={{ flex: 1 }}>
           <Stack
             css={{
               gap: "$3",
@@ -266,8 +233,8 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
                     <Label>Filename</Label>
                     <Input
                       value={filename}
-                      onChange={(e) => setFilename(e.target.value)}
+                      onChange={e => setFilename(e.target.value)}
-                      onKeyPress={(e) => {
+                      onKeyPress={e => {
                         if (e.key === "Enter") {
                           handleConfirm();
                         }
@@ -542,8 +509,8 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
               type="number"
               min="1"
               value={editorSettings.tabSize}
-              onChange={(e) =>
+              onChange={e =>
-                setEditorSettings((curr) => ({
+                setEditorSettings(curr => ({
                   ...curr,
                   tabSize: Number(e.target.value),
                 }))

components/HooksEditor.tsx

@@ -164,15 +164,21 @@ const HooksEditor = () => {
                 onConnection: (connection) => {
                   // create and start the language client
                   const languageClient = createLanguageClient(connection);
-                  const disposable = languageClient.start();
+                  languageClient.start();
-
+                  // connection.onDispose((d) => {
-                  connection.onClose(() => {
+                  //   console.log("disposed: ", d);
-                    try {
+                  // });
-                      disposable.dispose();
+                  // connection.onError((ee) => {
-                    } catch (err) {
+                  //   console.log(ee =)
-                      console.log("err", err);
+                  // })
-                    }
+                  // connection.onClose(() => {
-                  });
+                  //   try {
+                  //     // disposable.stop();
+                  //     disposable.dispose();
+                  //   } catch (err) {
+                  //     console.log("err", err);
+                  //   }
+                  // });
                 },
               });
             }

components/Navigation.tsx

@@ -340,8 +340,6 @@ const Navigation = () => {
               height: 0,
               background: "transparent",
             },
-            scrollbarColor: "transparent",
-            scrollbarWidth: "none",
           }}
         >
           <Stack

components/SetHookDialog.tsx

@@ -57,9 +57,7 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
   ({ accountAddress }) => {
     const snap = useSnapshot(state);
     const account = snap.accounts.find((acc) => acc.address === accountAddress);
-    const activeFile = snap.files[snap.active]?.compiledContent
+
-      ? snap.files[snap.active]
-      : snap.files.filter((file) => file.compiledContent)[0];
     const [isSetHookDialogOpen, setIsSetHookDialogOpen] = useState(false);
     const {
       register,
@@ -70,13 +68,11 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
       getValues,
       formState: { errors },
     } = useForm<SetHookData>({
-      defaultValues: snap.deployValues?.[activeFile?.name]
+      defaultValues: {
-        ? snap.deployValues[activeFile?.name]
+        HookNamespace:
-        : {
+          snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || "",
-            HookNamespace:
+        Invoke: transactionOptions.filter((to) => to.label === "ttPAYMENT"),
-              snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || "",
+      },
-            Invoke: transactionOptions.filter((to) => to.label === "ttPAYMENT"),
-          },
     });
     const { fields, append, remove } = useFieldArray({
       control,
@@ -85,21 +81,14 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
     const [formInitialized, setFormInitialized] = useState(false);
     const [estimateLoading, setEstimateLoading] = useState(false);
     const watchedFee = watch("Fee");
-
     // Update value if activeWat changes
     useEffect(() => {
-      const defaultValue = snap.deployValues?.[activeFile?.name]
+      setValue(
-        ? snap.deployValues?.[activeFile?.name].HookNamespace
+        "HookNamespace",
-        : snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || "";
+        snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || ""
-      setValue("HookNamespace", defaultValue);
+      );
       setFormInitialized(true);
-    }, [
+    }, [snap.activeWat, snap.files, setValue]);
-      snap.activeWat,
-      snap.files,
-      setValue,
-      activeFile?.name,
-      snap.deployValues,
-    ]);
     useEffect(() => {
       if (
         watchedFee &&
@@ -119,9 +108,7 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
     const [hashedNamespace, setHashedNamespace] = useState("");
     const namespace = watch(
       "HookNamespace",
-      snap.deployValues?.[activeFile?.name]
+      snap.files?.[snap.active]?.name?.split(".")?.[0] || ""
-        ? snap.deployValues?.[activeFile?.name].HookNamespace
-        : snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || ""
     );
     const calculateHashedValue = useCallback(async () => {
       const hashedVal = await sha256(namespace);
@@ -204,6 +191,9 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
                   <Controller
                     name="Invoke"
                     control={control}
+                    defaultValue={transactionOptions.filter(
+                      (to) => to.label === "ttPAYMENT"
+                    )}
                     render={({ field }) => (
                       <Select
                         {...field}
@@ -220,6 +210,9 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
                   <Input
                     {...register("HookNamespace", { required: true })}
                     autoComplete={"off"}
+                    defaultValue={
+                      snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || ""
+                    }
                   />
                   {errors.HookNamespace?.type === "required" && (
                     <Box css={{ display: "inline", color: "$red11" }}>

package.json

@@ -36,7 +36,6 @@
     "monaco-editor": "^0.33.0",
     "next": "^12.0.4",
     "next-auth": "^4.0.0-beta.5",
-    "next-plausible": "^3.2.0",
     "next-themes": "^0.1.1",
     "normalize-url": "^7.0.2",
     "octokit": "^1.7.0",

pages/_app.tsx

@@ -7,7 +7,6 @@ import { ThemeProvider } from "next-themes";
 import { Toaster } from "react-hot-toast";
 import { useRouter } from "next/router";
 import { IdProvider } from "@radix-ui/react-id";
-import PlausibleProvider from "next-plausible";
 
 import { darkTheme, css } from "../stitches.config";
 import Navigation from "../components/Navigation";
@@ -18,8 +17,6 @@ import TimeAgo from "javascript-time-ago";
 import en from "javascript-time-ago/locale/en.json";
 import { useSnapshot } from "valtio";
 import Alert from "../components/AlertDialog";
-import { Button, Flex } from "../components";
-import { ChatCircleText } from "phosphor-react";
 
 TimeAgo.setDefaultLocale(en.locale);
 TimeAgo.addLocale(en);
@@ -40,7 +37,7 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: AppProps) {
       if (
         !gistId &&
         router.isReady &&
-        router.pathname.includes("/develop") &&
+        !router.pathname.includes("/sign-in") &&
         !snap.files.length &&
         !snap.mainModalShowed
       ) {
@@ -117,7 +114,6 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: AppProps) {
           media="(prefers-color-scheme: light)"
         />
       </Head>
-
       <IdProvider>
         <SessionProvider session={session}>
           <ThemeProvider
@@ -129,40 +125,23 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: AppProps) {
               dark: darkTheme.className,
             }}
           >
-            <PlausibleProvider
+            <Navigation />
-              domain="hooks-builder.xrpl.org"
+            <Component {...pageProps} />
-              trackOutboundLinks
+            <Toaster
-            >
+              toastOptions={{
-              <Navigation />
+                className: css({
-              <Component {...pageProps} />
+                  backgroundColor: "$mauve1",
-              <Toaster
+                  color: "$mauve10",
-                toastOptions={{
+                  fontSize: "$sm",
-                  className: css({
+                  zIndex: 9999,
-                    backgroundColor: "$mauve1",
+                  ".dark &": {
-                    color: "$mauve10",
+                    backgroundColor: "$mauve4",
-                    fontSize: "$sm",
+                    color: "$mauve12",
-                    zIndex: 9999,
+                  },
-                    ".dark &": {
+                })(),
-                      backgroundColor: "$mauve4",
+              }}
-                      color: "$mauve12",
+            />
-                    },
+            <Alert />
-                  })(),
-                }}
-              />
-              <Alert />
-              <Flex
-                as="a"
-                href="https://github.com/XRPLF/Hooks/discussions"
-                target="_blank"
-                rel="noopener noreferrer"
-                css={{ position: "fixed", right: "$4", bottom: "$4" }}
-              >
-                <Button size="sm" variant="primary" outline>
-                  <ChatCircleText size={14} style={{ marginRight: "0px" }} />
-                  Bugs & Discussions
-                </Button>
-              </Flex>
-            </PlausibleProvider>
           </ThemeProvider>
         </SessionProvider>
       </IdProvider>

state/actions/deployHook.tsx

@@ -126,10 +126,6 @@ export const deployHook = async (
   data: SetHookData
 ) => {
   if (typeof window !== "undefined") {
-    const activeFile = state.files[state.active]?.compiledContent
-      ? state.files[state.active]
-      : state.files.filter((file) => file.compiledContent)[0];
-    state.deployValues[activeFile.name] = data;
     const tx = await prepareDeployHookTx(account, data);
     if (!tx) {
       return;

state/index.ts

@@ -52,8 +52,6 @@ export interface ILog {
   defaultCollapsed?: boolean
 }
 
-export type DeployValue = Record<IFile['name'], any>;
-
 export interface IState {
   files: IFile[];
   gistId?: string | null;
@@ -84,8 +82,7 @@ export interface IState {
   compileOptions: {
     optimizationLevel: '-O0' | '-O1' | '-O2' | '-O3' | '-O4' | '-Os';
     strip: boolean
-  },
+  }
-  deployValues: DeployValue
 }
 
 // let localStorageState: null | string = null;
@@ -119,8 +116,7 @@ let initialState: IState = {
   compileOptions: {
     optimizationLevel: '-O2',
     strip: true
-  },
+  }
-  deployValues: {}
 };
 
 let localStorageAccounts: string | null = null;

yarn.lock

@@ -2981,11 +2981,6 @@ next-auth@^4.0.0-beta.5:
     preact-render-to-string "^5.1.19"
     uuid "^8.3.2"
 
-next-plausible@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/next-plausible/-/next-plausible-3.2.0.tgz#d801346253e0c1cf64a02b9fc3a42050455cbc47"
-  integrity sha512-OlYcLXBG3kKd/fKMpm8SZ5IkUKSFm1/8t7cv6e5bewIqlpdZpdWuSrjbdJpbmutb2KPLXHzilKp09zmDGjy9KQ==
-
 next-themes@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/next-themes/-/next-themes-0.1.1.tgz#122113a458bf1d1be5ffed66778ab924c106f82a"