Added underline on hover to links

Simplified hook state, since endpoint now works with hookhashes
Remove debug code
2022-06-30 15:30:43 +03:00 · 2022-06-30 08:54:43 +03:00 · 2022-06-29 18:03:26 +03:00 · 2022-06-29 15:26:33 +03:00 · 2022-06-29 14:08:47 +03:00 · 2022-06-29 14:04:06 +03:00
17 changed files with 381 additions and 284 deletions
--- a/components/Accounts.tsx
+++ b/components/Accounts.tsx
@@ -116,9 +116,16 @@ export const AccountDialog = ({
                <Text
                  css={{
                    fontFamily: "$monospace",
+                    a: { "&:hover": { textDecoration: "underline" } },
                  }}
                >
-                  {activeAccount?.address}
+                  <a
+                    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" }}>
@@ -215,7 +222,11 @@ export const AccountDialog = ({
                  </Button>
                </Text>
              </Flex>
-              <Flex css={{ marginLeft: "auto" }}>
+              <Flex
+                css={{
+                  marginLeft: "auto",
+                }}
+              >
                <a
                  href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${activeAccount?.address}`}
                  target="_blank"
@@ -237,10 +248,22 @@ export const AccountDialog = ({
                <Text
                  css={{
                    fontFamily: "$monospace",
+                    a: { "&:hover": { textDecoration: "underline" } },
                  }}
                >
                  {activeAccount && activeAccount.hooks.length > 0
-                    ? activeAccount.hooks.map((i) => truncate(i, 12)).join(",")
+                    ? activeAccount.hooks.map((i) => {
+                        return (
+                          <a
+                            key={i}
+                            href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${i}`}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                          >
+                            {truncate(i, 12)}
+                          </a>
+                        );
+                      })
                    : "–"}
                </Text>
              </Flex>
@@ -512,6 +535,7 @@ const ImportAccountDialog = () => {
          <Input
            name="secret"
            type="password"
+            autoComplete="new-password"
            value={value}
            onChange={(e) => setValue(e.target.value)}
          />
--- a/components/DebugStream.tsx
+++ b/components/DebugStream.tsx
@@ -1,5 +1,7 @@
-import { useCallback, useEffect } from "react";
+import { 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";
@@ -15,7 +17,7 @@ export interface IStreamState {
  status: "idle" | "opened" | "closed";
  statusChangeTimestamp?: number;
  logs: ILog[];
-  socket?: WebSocket;
+  socket?: ReconnectingWebSocket;
 }

 export const streamState = proxy<IStreamState>({
@@ -24,12 +26,85 @@ 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, socket } = useSnapshot(streamState);
+  const { selectedAccount, logs } = 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,
  }));
@@ -42,117 +117,21 @@ const DebugStream = () => {
        options={accountOptions}
        hideSelectedOptions
        value={selectedAccount}
-        onChange={acc => (streamState.selectedAccount = acc as any)}
+        onChange={(acc) => {
+          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)
--- a/components/DeployEditor.tsx
+++ b/components/DeployEditor.tsx
@@ -34,7 +34,9 @@ const DeployEditor = () => {

  const [showContent, setShowContent] = useState(false);

-  const activeFile = snap.files[snap.active];
+  const activeFile = snap.files[snap.active]?.compiledContent
+    ? snap.files[snap.active]
+    : snap.files.filter((file) => file.compiledContent)[0];
  const compiledSize = activeFile?.compiledContent?.byteLength || 0;
  const color =
    compiledSize > FILESIZE_BREAKPOINTS[1]
@@ -60,12 +62,21 @@ const DeployEditor = () => {
        {activeFile?.lastCompiled && (
          <ReactTimeAgo date={activeFile.lastCompiled} locale="en-US" />
        )}
+
        {activeFile.compiledContent?.byteLength && (
          <Text css={{ ml: "$2", color }}>
            ({filesize(activeFile.compiledContent.byteLength)})
          </Text>
        )}
      </Flex>
+      {activeFile.compiledContent?.byteLength &&
+        activeFile.compiledContent?.byteLength >= 64000 && (
+          <Flex css={{ flexDirection: "column", py: "$3", pb: "$1" }}>
+            <Text css={{ ml: "$2", color: "$error" }}>
+              File size is larger than 64kB, cannot set hook!
+            </Text>
+          </Flex>
+        )}
      <Button variant="link" onClick={() => setShowContent(true)}>
        View as WAT-file
      </Button>
@@ -119,8 +130,8 @@ const DeployEditor = () => {
            className="hooks-editor"
            defaultLanguage={"wat"}
            language={"wat"}
-            path={`file://tmp/c/${snap.files?.[snap.active]?.name}.wat`}
-            value={snap.files?.[snap.active]?.compiledWatContent || ""}
+            path={`file://tmp/c/${activeFile?.name}.wat`}
+            value={activeFile?.compiledWatContent || ""}
            beforeMount={(monaco) => {
              monaco.languages.register({ id: "wat" });
              monaco.languages.setLanguageConfiguration("wat", wat.config);
--- a/components/EditorNavigation.tsx
+++ b/components/EditorNavigation.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useCallback } from "react";
+import React, { useState, useEffect, useCallback, useRef } 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,22 +132,55 @@ 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,
-            background: "transparent",
+            height: "0.3em",
+            background: "rgba(0,0,0,.0)",
+          },
+          "&::-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 }}>
+        <Container css={{ flex: 1 }} ref={containerRef}>
          <Stack
            css={{
              gap: "$3",
@@ -233,8 +266,8 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
                    <Label>Filename</Label>
                    <Input
                      value={filename}
-                      onChange={e => setFilename(e.target.value)}
-                      onKeyPress={e => {
+                      onChange={(e) => setFilename(e.target.value)}
+                      onKeyPress={(e) => {
                        if (e.key === "Enter") {
                          handleConfirm();
                        }
@@ -509,8 +542,8 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
              type="number"
              min="1"
              value={editorSettings.tabSize}
-              onChange={e =>
-                setEditorSettings(curr => ({
+              onChange={(e) =>
+                setEditorSettings((curr) => ({
                  ...curr,
                  tabSize: Number(e.target.value),
                }))
--- a/components/HooksEditor.tsx
+++ b/components/HooksEditor.tsx
@@ -164,21 +164,15 @@ const HooksEditor = () => {
                onConnection: (connection) => {
                  // create and start the language client
                  const languageClient = createLanguageClient(connection);
-                  languageClient.start();
-                  // connection.onDispose((d) => {
-                  //   console.log("disposed: ", d);
-                  // });
-                  // connection.onError((ee) => {
-                  //   console.log(ee =)
-                  // })
-                  // connection.onClose(() => {
-                  //   try {
-                  //     // disposable.stop();
-                  //     disposable.dispose();
-                  //   } catch (err) {
-                  //     console.log("err", err);
-                  //   }
-                  // });
+                  const disposable = languageClient.start();
+
+                  connection.onClose(() => {
+                    try {
+                      disposable.dispose();
+                    } catch (err) {
+                      console.log("err", err);
+                    }
+                  });
                },
              });
            }
--- a/components/Navigation.tsx
+++ b/components/Navigation.tsx
@@ -30,12 +30,6 @@ import PanelBox from "./PanelBox";
 import { templateFileIds } from "../state/constants";
 import { styled } from "../stitches.config";

-import Starter from "../components/icons/Starter";
-import Firewall from "../components/icons/Firewall";
-import Notary from "../components/icons/Notary";
-import Carbon from "../components/icons/Carbon";
-import Peggy from "../components/icons/Peggy";
-
 const ImageWrapper = styled(Flex, {
  position: "relative",
  mt: "$2",
@@ -301,66 +295,18 @@ const Navigation = () => {
                        },
                      }}
                    >
-                      <PanelBox
-                        as="a"
-                        href={`/develop/${templateFileIds.starter}`}
-                      >
-                        <ImageWrapper>
-                          <Starter />
-                        </ImageWrapper>
-                        <Heading>Starter</Heading>
+                      {Object.values(templateFileIds).map((template) => (
+                        <PanelBox
+                          key={template.id}
+                          as="a"
+                          href={`/develop/${template.id}`}
+                        >
+                          <ImageWrapper>{template.icon()}</ImageWrapper>
+                          <Heading>{template.name}</Heading>

-                        <Text>
-                          Just a basic starter with essential imports, just
-                          accepts any transaction coming through
-                        </Text>
-                      </PanelBox>
-
-                      <PanelBox
-                        as="a"
-                        href={`/develop/${templateFileIds.firewall}`}
-                        css={{ alignItems: "flex-start" }}
-                      >
-                        <ImageWrapper>
-                          <Firewall />
-                        </ImageWrapper>
-                        <Heading>Firewall</Heading>
-                        <Text>
-                          This Hook essentially checks a blacklist of accounts
-                        </Text>
-                      </PanelBox>
-                      <PanelBox
-                        as="a"
-                        href={`/develop/${templateFileIds.notary}`}
-                      >
-                        <ImageWrapper>
-                          <Notary />
-                        </ImageWrapper>
-                        <Heading>Notary</Heading>
-                        <Text>
-                          Collecting signatures for multi-sign transactions
-                        </Text>
-                      </PanelBox>
-                      <PanelBox
-                        as="a"
-                        href={`/develop/${templateFileIds.carbon}`}
-                      >
-                        <ImageWrapper>
-                          <Carbon />
-                        </ImageWrapper>
-                        <Heading>Carbon</Heading>
-                        <Text>Send a percentage of sum to an address</Text>
-                      </PanelBox>
-                      <PanelBox
-                        as="a"
-                        href={`/develop/${templateFileIds.peggy}`}
-                      >
-                        <ImageWrapper>
-                          <Peggy />
-                        </ImageWrapper>
-                        <Heading>Peggy</Heading>
-                        <Text>An oracle based stable coin hook</Text>
-                      </PanelBox>
+                          <Text>{template.description}</Text>
+                        </PanelBox>
+                      ))}
                    </Flex>
                  </Flex>
                  <DialogClose asChild>
@@ -394,6 +340,8 @@ const Navigation = () => {
              height: 0,
              background: "transparent",
            },
+            scrollbarColor: "transparent",
+            scrollbarWidth: "none",
          }}
        >
          <Stack
--- a/components/SetHookDialog.tsx
+++ b/components/SetHookDialog.tsx
@@ -57,7 +57,9 @@ 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,
@@ -68,11 +70,13 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
      getValues,
      formState: { errors },
    } = useForm<SetHookData>({
-      defaultValues: {
-        HookNamespace:
-          snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || "",
-        Invoke: transactionOptions.filter((to) => to.label === "ttPAYMENT"),
-      },
+      defaultValues: snap.deployValues?.[activeFile?.name]
+        ? snap.deployValues[activeFile?.name]
+        : {
+            HookNamespace:
+              snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || "",
+            Invoke: transactionOptions.filter((to) => to.label === "ttPAYMENT"),
+          },
    });
    const { fields, append, remove } = useFieldArray({
      control,
@@ -81,14 +85,21 @@ 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(() => {
-      setValue(
-        "HookNamespace",
-        snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || ""
-      );
+      const defaultValue = snap.deployValues?.[activeFile?.name]
+        ? snap.deployValues?.[activeFile?.name].HookNamespace
+        : 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 &&
@@ -108,7 +119,9 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
    const [hashedNamespace, setHashedNamespace] = useState("");
    const namespace = watch(
      "HookNamespace",
-      snap.files?.[snap.active]?.name?.split(".")?.[0] || ""
+      snap.deployValues?.[activeFile?.name]
+        ? snap.deployValues?.[activeFile?.name].HookNamespace
+        : snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || ""
    );
    const calculateHashedValue = useCallback(async () => {
      const hashedVal = await sha256(namespace);
@@ -140,6 +153,16 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
      return null;
    }

+    const tooLargeFile = () => {
+      const activeFile = snap.files[snap.active].compiledContent
+        ? snap.files[snap.active]
+        : snap.files.filter((file) => file.compiledContent)[0];
+      return Boolean(
+        activeFile?.compiledContent?.byteLength &&
+          activeFile?.compiledContent?.byteLength >= 64000
+      );
+    };
+
    const onSubmit: SubmitHandler<SetHookData> = async (data) => {
      const currAccount = state.accounts.find(
        (acc) => acc.address === account.address
@@ -164,7 +187,8 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
            variant={"secondary"}
            disabled={
              account.isLoading ||
-              !snap.files.filter((file) => file.compiledWatContent).length
+              !snap.files.filter((file) => file.compiledWatContent).length ||
+              tooLargeFile()
            }
          >
            Set Hook
@@ -180,9 +204,6 @@ 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}
@@ -199,9 +220,6 @@ 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" }}>
--- a/components/Transaction/ui.tsx
+++ b/components/Transaction/ui.tsx
@@ -38,22 +38,22 @@ export const TxUI: FC<UIProps> = ({
    txFields,
  } = txState;

-  const transactionsOptions = transactionsData.map(tx => ({
+  const transactionsOptions = transactionsData.map((tx) => ({
    value: tx.TransactionType,
    label: tx.TransactionType,
  }));

-  const accountOptions: SelectOption[] = accounts.map(acc => ({
+  const accountOptions: SelectOption[] = accounts.map((acc) => ({
    label: acc.name,
    value: acc.address,
  }));

  const destAccountOptions: SelectOption[] = accounts
-    .map(acc => ({
+    .map((acc) => ({
      label: acc.name,
      value: acc.address,
    }))
-    .filter(acc => acc.value !== selectedAccount?.value);
+    .filter((acc) => acc.value !== selectedAccount?.value);

  const [feeLoading, setFeeLoading] = useState(false);

@@ -108,15 +108,15 @@ export const TxUI: FC<UIProps> = ({
  const specialFields = ["TransactionType", "Account", "Destination"];

  const otherFields = Object.keys(txFields).filter(
-    k => !specialFields.includes(k)
+    (k) => !specialFields.includes(k)
  ) as [keyof TxFields];

  const switchToJson = () =>
    setState({ editorSavedValue: null, viewType: "json" });
-  
+
  useEffect(() => {
    const defaultOption = transactionsOptions.find(
-      tt => tt.value === "Payment"
+      (tt) => tt.value === "Payment"
    );
    if (defaultOption) {
      handleChangeTxType(defaultOption);
@@ -204,7 +204,7 @@ export const TxUI: FC<UIProps> = ({
            />
          </Flex>
        )}
-        {otherFields.map(field => {
+        {otherFields.map((field) => {
          let _value = txFields[field];

          let value: string | undefined;
@@ -253,13 +253,39 @@ export const TxUI: FC<UIProps> = ({
                  />
                ) : (
                  <Input
+                    type={isFee ? "number" : "text"}
                    value={value}
-                    onChange={e => {
-                      handleSetField(field, e.target.value);
+                    onChange={(e) => {
+                      if (isFee) {
+                        const val = e.target.value
+                          .replaceAll(".", "")
+                          .replaceAll(",", "");
+                        handleSetField(field, val);
+                      } else {
+                        handleSetField(field, e.target.value);
+                      }
                    }}
+                    onKeyPress={
+                      isFee
+                        ? (e) => {
+                            if (e.key === "." || e.key === ",") {
+                              e.preventDefault();
+                            }
+                          }
+                        : undefined
+                    }
                    css={{
                      width: "70%",
                      flex: "inherit",
+                      "-moz-appearance": "textfield",
+                      "&::-webkit-outer-spin-button": {
+                        "-webkit-appearance": "none",
+                        margin: 0,
+                      },
+                      "&::-webkit-inner-spin-button ": {
+                        "-webkit-appearance": "none",
+                        margin: 0,
+                      },
                    }}
                  />
                )}
@@ -268,6 +294,8 @@ export const TxUI: FC<UIProps> = ({
                    size="xs"
                    variant="primary"
                    outline
+                    disabled={txState.txIsDisabled}
+                    isDisabled={txState.txIsDisabled}
                    isLoading={feeLoading}
                    css={{
                      position: "absolute",
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
    "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",
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -7,6 +7,7 @@ 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";
@@ -17,6 +18,8 @@ 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);
@@ -37,7 +40,7 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: AppProps) {
      if (
        !gistId &&
        router.isReady &&
-        !router.pathname.includes("/sign-in") &&
+        router.pathname.includes("/develop") &&
        !snap.files.length &&
        !snap.mainModalShowed
      ) {
@@ -114,6 +117,7 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: AppProps) {
          media="(prefers-color-scheme: light)"
        />
      </Head>
+
      <IdProvider>
        <SessionProvider session={session}>
          <ThemeProvider
@@ -125,23 +129,40 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: AppProps) {
              dark: darkTheme.className,
            }}
          >
-            <Navigation />
-            <Component {...pageProps} />
-            <Toaster
-              toastOptions={{
-                className: css({
-                  backgroundColor: "$mauve1",
-                  color: "$mauve10",
-                  fontSize: "$sm",
-                  zIndex: 9999,
-                  ".dark &": {
-                    backgroundColor: "$mauve4",
-                    color: "$mauve12",
-                  },
-                })(),
-              }}
-            />
-            <Alert />
+            <PlausibleProvider
+              domain="hooks-builder.xrpl.org"
+              trackOutboundLinks
+            >
+              <Navigation />
+              <Component {...pageProps} />
+              <Toaster
+                toastOptions={{
+                  className: css({
+                    backgroundColor: "$mauve1",
+                    color: "$mauve10",
+                    fontSize: "$sm",
+                    zIndex: 9999,
+                    ".dark &": {
+                      backgroundColor: "$mauve4",
+                      color: "$mauve12",
+                    },
+                  })(),
+                }}
+              />
+              <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>
--- a/pages/test/[[...slug]].tsx
+++ b/pages/test/[[...slug]].tsx
@@ -32,14 +32,20 @@ const Test = () => {
  if (!showComponent) {
    return null;
  }
-  const hasScripts =
-    snap.files.filter((f) => f.name.endsWith(".js")).length > 0;
+  const hasScripts = Boolean(
+    snap.files.filter((f) => f.name.toLowerCase()?.endsWith(".js")).length
+  );
+
  return (
    <Container css={{ px: 0 }}>
      <Split
        direction="vertical"
        sizes={
-          getSplit("testVertical") || (hasScripts ? [50, 20, 30] : [50, 50])
+          hasScripts && getSplit("testVertical")?.length === 2
+            ? [50, 20, 30]
+            : hasScripts
+            ? [50, 20, 50]
+            : [50, 50]
        }
        gutterSize={4}
        gutterAlign="center"
@@ -95,7 +101,7 @@ const Test = () => {
            </Box>
          </Split>
        </Flex>
-        {hasScripts && (
+        {hasScripts ? (
          <Flex
            as="div"
            css={{
@@ -110,7 +116,7 @@ const Test = () => {
              clearLog={() => (state.scriptLogs = [])}
            />
          </Flex>
-        )}
+        ) : null}
        <Flex>
          <Split
            direction="horizontal"
--- a/state/actions/compileCode.ts
+++ b/state/actions/compileCode.ts
@@ -39,7 +39,7 @@ export const compileCode = async (activeId: number) => {
        files: [
          {
            type: "c",
-            options: state.compileOptions.optimizationLevel || '-O0',
+            options: state.compileOptions.optimizationLevel || '-O2',
            name: state.files[activeId].name,
            src: state.files[activeId].content,
          },
--- a/state/actions/deployHook.tsx
+++ b/state/actions/deployHook.tsx
@@ -54,15 +54,15 @@ export const prepareDeployHookTx = async (
  account: IAccount & { name?: string },
  data: SetHookData
 ) => {
-  if (
-    !state.files ||
-    state.files.length === 0 ||
-    !state.files?.[state.active]?.compiledContent
-  ) {
+  const activeFile = state.files[state.active]?.compiledContent
+    ? state.files[state.active]
+    : state.files.filter((file) => file.compiledContent)[0];
+
+  if (!state.files || state.files.length === 0) {
    return;
  }

-  if (!state.files?.[state.active]?.compiledContent) {
+  if (!activeFile?.compiledContent) {
    return;
  }
  if (!state.client) {
@@ -99,7 +99,7 @@ export const prepareDeployHookTx = async (
        {
          Hook: {
            CreateCode: arrayBufferToHex(
-              state.files?.[state.active]?.compiledContent
+              activeFile?.compiledContent
            ).toUpperCase(),
            HookOn: calculateHookOn(hookOnValues),
            HookNamespace,
@@ -126,6 +126,10 @@ 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;
--- a/state/actions/fetchFiles.ts
+++ b/state/actions/fetchFiles.ts
@@ -19,7 +19,7 @@ export const fetchFiles = (gistId: string) => {
    octokit
      .request("GET /gists/{gist_id}", { gist_id: gistId })
      .then(async res => {
-        if (!Object.values(templateFileIds).includes(gistId)) {
+        if (!Object.values(templateFileIds).map(v => v.id).includes(gistId)) {
          return res
        }
        // in case of templates, fetch header file(s) and append to res
--- a/state/constants/templates.ts
+++ b/state/constants/templates.ts
@@ -1,20 +1,41 @@
-// export const templateFileIds = {
-//     'starter': '1d14e51e2e02dc0a508cb0733767a914', // TODO currently same as accept
-//     'firewall': 'bcd6d0c0fcbe52545ddb802481ff9d26',
-//     'notary': 'a789c75f591eeab7932fd702ed8cf9ea',
-//     'carbon': '43925143fa19735d8c6505c34d3a6a47',
-//     'peggy': 'ceaf352e2a65741341033ab7ef05c448',
-//     'headers': '9b448e8a55fab11ef5d1274cb59f9cf3'
-// }
+import Carbon from "../../components/icons/Carbon";
+import Firewall from "../../components/icons/Firewall";
+import Notary from "../../components/icons/Notary";
+import Peggy from "../../components/icons/Peggy";
+import Starter from "../../components/icons/Starter";

 export const templateFileIds = {
-    'starter': '1f7d2963d9e342ea092286115274f3e3',
-    'firewall': '70edec690f0de4dd315fad1f4f996d8c',
-    'notary': '3d5677768fe8a54c4f6317e185d9ba66',
-    'carbon': 'a9fbcaf1b816b198c7fc0f62962bebf2',
-    'doubler': '56b86174aeb70b2b48eee962bad3e355',
-    'peggy': 'd21298a37e1550b781682014762a567b',
-    'headers': '55f639bce59a49c58c45e663776b5138'
+    'starter': {
+        id: '9106f1fe60482d90475bfe8f1315affe',
+        name: 'Starter',
+        description: 'Just a basic starter with essential imports, just accepts any transaction coming through',
+        icon: Starter
+
+    },
+    'firewall': {
+        id: '741816f53eddac862ef1ba400e1b9b84',
+        name: 'Firewall',
+        description: 'This Hook essentially checks a blacklist of accounts',
+        icon: Firewall
+    },
+    'notary': {
+        id: '0dfe12adb0aa75cff24c3c19497fb95a',
+        name: 'Notary',
+        description: 'Collecting signatures for multi-sign transactions',
+        icon: Notary
+    },
+    'carbon': {
+        id: '5941c19dce3e147948f564e224553c02',
+        name: 'Carbon',
+        description: 'Send a percentage of sum to an address',
+        icon: Carbon
+    },
+    'peggy': {
+        id: '52e61c02e777c44c913808981a4ca61f',
+        name: 'Peggy',
+        description: 'An oracle based stable coin hook',
+        icon: Peggy
+    },
 }

-export const apiHeaderFiles = ['hookapi.h', 'sfcodes.h', 'hookmacro.h']
+export const apiHeaderFiles = ['hookapi.h', 'sfcodes.h', 'macro.h', 'extern.h', 'error.h'];
--- a/state/index.ts
+++ b/state/index.ts
@@ -52,6 +52,8 @@ export interface ILog {
  defaultCollapsed?: boolean
 }

+export type DeployValue = Record<IFile['name'], any>;
+
 export interface IState {
  files: IFile[];
  gistId?: string | null;
@@ -82,7 +84,8 @@ export interface IState {
  compileOptions: {
    optimizationLevel: '-O0' | '-O1' | '-O2' | '-O3' | '-O4' | '-Os';
    strip: boolean
-  }
+  },
+  deployValues: DeployValue
 }

 // let localStorageState: null | string = null;
@@ -114,9 +117,10 @@ let initialState: IState = {
  mainModalShowed: false,
  accounts: [],
  compileOptions: {
-    optimizationLevel: '-O0',
+    optimizationLevel: '-O2',
    strip: true
-  }
+  },
+  deployValues: {}
 };

 let localStorageAccounts: string | null = null;
--- a/yarn.lock
+++ b/yarn.lock
@@ -2981,6 +2981,11 @@ 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"
Author	SHA1	Message	Date
Valtteri Karesto	407e3946ce	Added underline on hover to links	2022-06-30 15:30:43 +03:00
Valtteri Karesto	dc5b0d71eb	Simplified hook state, since endpoint now works with hookhashes	2022-06-30 08:54:43 +03:00
Valtteri Karesto	3fd6c3f50e	Remove debug code	2022-06-29 18:03:26 +03:00
Valtteri Karesto	ec8bfc5eee	Add links to account modal	2022-06-29 15:26:33 +03:00
Valtteri Karesto	b4a0bcb90d	Merge pull request #227 from XRPLF/feat/remember-deploy-values Remember deploy values / Add feedback button	2022-06-29 14:08:47 +03:00
Valtteri Karesto	2c729e2aa4	Update button text	2022-06-29 14:04:06 +03:00
Valtteri Karesto	1cb2542170	Merge branch 'main' of github.com:eqlabs/xrpl-hooks-ide into feat/remember-deploy-values	2022-06-29 13:47:41 +03:00
Wietse Wind	00b309df34	Merge pull request #228 from XRPLF/feature/add-plausible-analytics Add plausible analytics to builder	2022-06-29 12:10:58 +02:00
Joni Juup	a6fc730de6	add plausible analytics to builder	2022-06-29 12:58:17 +03:00
Valtteri Karesto	2245c5a221	Test gh integration	2022-06-29 12:18:38 +03:00
Valtteri Karesto	60c33661ad	Add proper defaultvalue	2022-06-29 12:14:52 +03:00
Valtteri Karesto	ea21c85038	Add noopener and noreferrer to link	2022-06-29 11:37:22 +03:00
Valtteri Karesto	5478f43609	persist deploy values in memory	2022-06-29 11:32:15 +03:00
Valtteri Karesto	a9b64abb85	Add feedback button, show modal only on homepage	2022-06-29 11:31:46 +03:00
Valtteri Karesto	c6ced424d8	Merge pull request #226 from XRPLF/feat/long-navigation-support Fix #215 scrollbar issues	2022-06-28 14:59:35 +03:00
Valtteri Karesto	3a1159cffc	Make thumbs more visible	2022-06-28 14:49:34 +03:00
Valtteri Karesto	3136de1bd1	Slight style adjustments	2022-06-28 14:38:59 +03:00
Valtteri Karesto	67ffd3f1b4	Fix #215 scrollbar issues	2022-06-28 14:01:08 +03:00
Valtteri Karesto	8508cb69c4	Merge pull request #224 from XRPLF/feat/debug-stream-fixes Feat/debug stream fixes	2022-06-28 11:31:03 +03:00
Valtteri Karesto	89217d2633	Remove console.log	2022-06-28 11:03:56 +03:00
Valtteri Karesto	ba1b64391c	ping socket connection	2022-06-28 09:36:45 +03:00
Valtteri Karesto	098d919a77	Bring back dispose	2022-06-27 15:03:49 +03:00
Valtteri Karesto	b2af37ab4b	Use reconnecting-websocket and refactor debug stream	2022-06-27 15:03:42 +03:00
Valtteri Karesto	dcb7e94e86	New gists provided by XRPL (#223 ) * Prepare logic for new gists * Remove unused imports * updated gist IDs for xrplfgists * Add macro.h to apiheaderfiles * Update headers Co-authored-by: Vaclav Barta <vbarta@mangrove.cz>	2022-06-27 08:25:25 +02:00
Valtteri Karesto	67848b3d8d	Merge pull request #222 from XRPLF/fix/suggest-button-disabled Fix/suggest button disabled	2022-06-23 11:12:04 +03:00
Valtteri Karesto	31a86263a1	Disable suggest if no account selected	2022-06-22 14:42:50 +03:00
Valtteri Karesto	4d0025afc1	Fix splitscreen error	2022-06-22 14:42:39 +03:00
Valtteri Karesto	f85bd2398d	Merge pull request #220 from XRPLF/fix/decimals-again fixes #201	2022-06-22 12:28:12 +03:00
Valtteri Karesto	a2a6596cc5	Prevent pasting decimals	2022-06-22 12:16:36 +03:00
Valtteri Karesto	37208ce97e	fixes #201	2022-06-22 12:03:43 +03:00
Valtteri Karesto	bf4042926d	Merge pull request #218 from XRPLF/feat/ui-fixes Fixes #213 and fixes #200	2022-06-22 11:41:31 +03:00
Valtteri Karesto	3ccc1c16ac	Fixed deploy	2022-06-22 11:32:07 +03:00
Valtteri Karesto	135f0c91a1	Fixes #213 and fixes #200	2022-06-22 11:06:15 +03:00
Valtteri Karesto	8f5786e242	Merge pull request #216 from XRPLF/feat/change-default-optimization fixes #214 change default optimization	2022-06-22 09:56:15 +03:00
Valtteri Karesto	810eb4ca27	Add new default to compileCode as well	2022-06-22 09:52:47 +03:00
Valtteri Karesto	e6574f9f12	fixes #214 change default optimization	2022-06-22 09:47:30 +03:00
Valtteri Karesto	1a6726fabf	Merge pull request #212 from XRPLF/feat/improve-supp-js Improve supplementary JS feature	2022-06-21 11:28:42 +03:00