requiring user-quoted Hook Parameter values

.env.example

@@ -1,5 +1,4 @@
 NEXTAUTH_URL=https://example.com
-NEXTAUTH_SECRET="1234"
 GITHUB_SECRET=""
 GITHUB_ID=""
 NEXT_PUBLIC_COMPILE_API_ENDPOINT="http://localhost:9000/api/build"

README.md

@@ -1,8 +1,6 @@
-# XRPL Hooks Builder
+# XRPL Hooks IDE
 
-https://hooks-builder.xrpl.org/
+This is the repository for XRPL Hooks IDE. This project is built with Next.JS
-
-This is the repository for XRPL Hooks Builder. This project is built with Next.JS
 
 ## General
 
@@ -108,5 +106,3 @@ To learn more about Next.js, take a look at the following resources:
 - [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
 
 You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
-
-

components/Accounts.tsx

@@ -18,7 +18,7 @@ import {
   DialogTrigger,
 } from "./Dialog";
 import { css } from "../stitches.config";
-import { Input, Label } from "./Input";
+import { Input } from "./Input";
 import truncate from "../utils/truncate";
 
 const labelStyle = css({
@@ -304,18 +304,6 @@ const Accounts: FC<AccountProps> = (props) => {
           if (accountToUpdate) {
             accountToUpdate.xrp = balance;
             accountToUpdate.sequence = sequence;
-            accountToUpdate.error = null;
-          } else {
-            const oldAccount = state.accounts.find(
-              (acc) => acc.address === res?.account
-            );
-            if (oldAccount) {
-              oldAccount.xrp = "0";
-              oldAccount.error = {
-                code: res?.error,
-                message: res?.error_message,
-              };
-            }
           }
         });
         const objectRequests = snap.accounts.map((acc) => {
@@ -355,7 +343,7 @@ const Accounts: FC<AccountProps> = (props) => {
       }
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [snap.accounts.length, snap.clientStatus]);
+  }, [snap.accounts, snap.clientStatus]);
   return (
     <Box
       as="div"
@@ -443,23 +431,18 @@ const Accounts: FC<AccountProps> = (props) => {
                       wordBreak: "break-word",
                     }}
                   >
-                    {account.address}{" "}
+                    {account.address} (
-                    {!account?.error ? (
+                    {Dinero({
-                      `(${Dinero({
+                      amount: Number(account?.xrp || "0"),
-                        amount: Number(account?.xrp || "0"),
+                      precision: 6,
-                        precision: 6,
+                    })
-                      })
+                      .toUnit()
-                        .toUnit()
+                      .toLocaleString(undefined, {
-                        .toLocaleString(undefined, {
+                        style: "currency",
-                          style: "currency",
+                        currency: "XRP",
-                          currency: "XRP",
+                        currencyDisplay: "name",
-                          currencyDisplay: "name",
+                      })}
-                        })})`
+                    )
-                    ) : (
-                      <Box css={{ color: "$red11" }}>
-                        (Account not found, request funds to activate account)
-                      </Box>
-                    )}
                   </Text>
                 </Box>
                 {!props.hideDeployBtn && (
@@ -469,7 +452,7 @@ const Accounts: FC<AccountProps> = (props) => {
                       e.stopPropagation();
                     }}
                   >
-                    <SetHookDialog accountAddress={account.address} />
+                    <SetHookDialog account={account} />
                   </div>
                 )}
               </Flex>
@@ -508,11 +491,10 @@ const ImportAccountDialog = () => {
       <DialogContent>
         <DialogTitle>Import account</DialogTitle>
         <DialogDescription>
-          <Label>Add account secret</Label>
+          <label>Add account secret</label>
           <Input
             name="secret"
             type="password"
-            autoComplete="new-password"
             value={value}
             onChange={(e) => setValue(e.target.value)}
           />

components/AlertDialog.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { blackA } from "@radix-ui/colors";
 import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog";
-import { styled, keyframes } from "../../stitches.config";
+import { styled, keyframes } from "../stitches.config";
 
 const overlayShow = keyframes({
   "0%": { opacity: 0 },
@@ -75,7 +75,7 @@ const StyledDescription = styled(AlertDialogPrimitive.Description, {
   marginBottom: 20,
   color: "$mauve11",
   lineHeight: 1.5,
-  fontSize: "$md",
+  fontSize: "$sm",
 });
 
 // Exports

components/AlertDialog/index.tsx

@@ -1,75 +0,0 @@
-import { FC, ReactNode } from "react";
-import { proxy, useSnapshot } from "valtio";
-import Button from "../Button";
-import Flex from "../Flex";
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogTitle,
-} from "./primitive";
-
-export interface AlertState {
-  isOpen: boolean;
-  title?: string;
-  body?: ReactNode;
-  cancelText?: string;
-  confirmText?: string;
-  confirmPrefix?: ReactNode;
-  onConfirm?: () => any;
-  onCancel?: () => any;
-}
-
-export const alertState = proxy<AlertState>({
-  isOpen: false,
-});
-
-const Alert: FC = () => {
-  const {
-    title = "Are you sure?",
-    isOpen,
-    body,
-    cancelText,
-    confirmText = "Ok",
-    confirmPrefix,
-    onCancel,
-    onConfirm,
-  } = useSnapshot(alertState);
-  return (
-    <AlertDialog
-      open={isOpen}
-      onOpenChange={value => (alertState.isOpen = value)}
-    >
-      <AlertDialogContent>
-        <AlertDialogTitle>{title}</AlertDialogTitle>
-        <AlertDialogDescription>{body}</AlertDialogDescription>
-        <Flex css={{ justifyContent: "flex-end", gap: "$3" }}>
-          {(cancelText || onCancel) && (
-            <AlertDialogCancel asChild>
-              <Button css={{ minWidth: "$16" }} outline onClick={onCancel}>
-                {cancelText || "Cancel"}
-              </Button>
-            </AlertDialogCancel>
-          )}
-          <AlertDialogAction asChild>
-            <Button
-              css={{ minWidth: "$16" }}
-              variant="primary"
-              onClick={async () => {
-                await onConfirm?.();
-                alertState.isOpen = false;
-              }}
-            >
-              {confirmPrefix}
-              {confirmText}
-            </Button>
-          </AlertDialogAction>
-        </Flex>
-      </AlertDialogContent>
-    </AlertDialog>
-  );
-};
-
-export default Alert;

components/DebugStream.tsx

@@ -1,7 +1,7 @@
 import { useCallback, useEffect } from "react";
 import { proxy, ref, useSnapshot } from "valtio";
 import { Select } from ".";
-import state, { ILog, transactionsState } from "../state";
+import state, { ILog } from "../state";
 import { extractJSON } from "../utils/json";
 import LogBox from "./LogBox";
 
@@ -10,26 +10,17 @@ interface ISelect<T = string> {
   value: T;
 }
 
-export interface IStreamState {
+const streamState = proxy({
-  selectedAccount: ISelect | null;
-  status: "idle" | "opened" | "closed";
-  statusChangeTimestamp?: number;
-  logs: ILog[];
-  socket?: WebSocket;
-}
-
-export const streamState = proxy<IStreamState>({
   selectedAccount: null as ISelect | null,
-  status: "idle",
   logs: [] as ILog[],
+  socket: undefined as WebSocket | undefined,
 });
 
 const DebugStream = () => {
   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,
   }));
@@ -42,12 +33,39 @@ const DebugStream = () => {
         options={accountOptions}
         hideSelectedOptions
         value={selectedAccount}
-        onChange={acc => (streamState.selectedAccount = acc as any)}
+        onChange={(acc) => (streamState.selectedAccount = acc as any)}
         css={{ width: "100%" }}
       />
     </>
   );
 
+  const prepareLog = useCallback((str: any): ILog => {
+    if (typeof str !== "string") throw Error("Unrecognized debug log stream!");
+
+    const match = str.match(/([\s\S]+(?:UTC|ISO|GMT[+|-]\d+))\ ?([\s\S]*)/m);
+    const [_, tm, msg] = match || [];
+
+    const extracted = extractJSON(msg);
+    const timestamp = isNaN(Date.parse(tm || ""))
+      ? tm
+      : new Date(tm).toLocaleTimeString();
+
+    const message = !extracted
+      ? msg
+      : msg.slice(0, extracted.start) + msg.slice(extracted.end + 1);
+
+    const jsonData = extracted
+      ? JSON.stringify(extracted.result, null, 2)
+      : undefined;
+    return {
+      type: "log",
+      message,
+      timestamp,
+      jsonData,
+      defaultCollapsed: true,
+    };
+  }, []);
+
   useEffect(() => {
     const account = selectedAccount?.value;
     if (account && (!socket || !socket.url.endsWith(account))) {
@@ -63,50 +81,6 @@ const DebugStream = () => {
     }
   }, [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;
@@ -114,27 +88,37 @@ const DebugStream = () => {
 
     const onOpen = () => {
       streamState.logs = [];
-      streamState.status = "opened";
+      streamState.logs.push({
-      streamState.statusChangeTimestamp = Date.now();
-      pushLog(`Debug stream opened for account ${account}`, {
         type: "success",
+        message: `Debug stream opened for account ${account}`,
       });
     };
     const onError = () => {
-      pushLog("Something went wrong! Check your connection and try again.", {
+      streamState.logs.push({
         type: "error",
+        message: "Something went wrong! Check your connection and try again.",
       });
     };
     const onClose = (e: CloseEvent) => {
-      pushLog(`Connection was closed. [code: ${e.code}]`, {
+      streamState.logs.push({
         type: "error",
+        message: `Connection was closed. [code: ${e.code}]`,
       });
       streamState.selectedAccount = null;
-      streamState.status = "closed";
-      streamState.statusChangeTimestamp = Date.now();
     };
     const onMessage = (event: any) => {
-      pushLog(event.data);
+      if (!event.data) return;
+      const log = prepareLog(event.data);
+      // Filter out account_info and account_objects requests
+      try {
+        const parsed = JSON.parse(log.jsonData);
+        if (parsed?.id?._Request?.includes("hooks-builder-req")) {
+          return;
+        }
+      } catch (err) {
+        // Lets just skip if we cannot parse the message
+      }
+      return streamState.logs.push(log);
     };
 
     socket.addEventListener("open", onOpen);
@@ -148,70 +132,16 @@ const DebugStream = () => {
       socket.removeEventListener("message", onMessage);
       socket.removeEventListener("error", onError);
     };
-  }, [selectedAccount?.value, socket]);
+  }, [prepareLog, selectedAccount?.value, socket]);
-
-  useEffect(() => {
-    const account = transactionsState.transactions.find(
-      tx => tx.header === activeTxTab
-    )?.state.selectedAccount;
-
-    if (account && account.value !== streamState.selectedAccount?.value)
-      streamState.selectedAccount = account;
-  }, [activeTxTab]);
-
-  const clearLog = () => {
-    streamState.logs = [];
-    streamState.statusChangeTimestamp = Date.now();
-  };
-
   return (
     <LogBox
       enhanced
       renderNav={renderNav}
       title="Debug stream"
       logs={logs}
-      clearLog={clearLog}
+      clearLog={() => (streamState.logs = [])}
     />
   );
 };
 
 export default DebugStream;
-
-export const pushLog = (
-  str: any,
-  opts: Partial<Pick<ILog, "type">> = {}
-): ILog | undefined => {
-  if (!str) return;
-  if (typeof str !== "string") throw Error("Unrecognized debug log stream!");
-
-  const match = str.match(/([\s\S]+(?:UTC|ISO|GMT[+|-]\d+))?\ ?([\s\S]*)/m);
-  const [_, tm, msg] = match || [];
-
-  const timestamp = Date.parse(tm || "") || undefined;
-  const timestring = !timestamp ? tm : new Date(timestamp).toLocaleTimeString();
-
-  const extracted = extractJSON(msg);
-  const message = !extracted
-    ? msg
-    : msg.slice(0, extracted.start) + msg.slice(extracted.end + 1);
-
-  const jsonData = extracted
-    ? JSON.stringify(extracted.result, null, 2)
-    : undefined;
-
-  if (extracted?.result?.id?._Request?.includes("hooks-builder-req")) {
-    return;
-  }
-
-  const { type = "log" } = opts;
-  const log: ILog = {
-    type,
-    message,
-    timestring,
-    jsonData,
-    defaultCollapsed: true,
-  };
-
-  if (log) streamState.logs.push(log);
-  return log;
-};

components/DeployEditor.tsx

@@ -34,9 +34,7 @@ const DeployEditor = () => {
 
   const [showContent, setShowContent] = useState(false);
 
-  const activeFile = snap.files[snap.active]?.compiledContent
+  const activeFile = snap.files[snap.active];
-    ? snap.files[snap.active]
-    : snap.files.filter((file) => file.compiledContent)[0];
   const compiledSize = activeFile?.compiledContent?.byteLength || 0;
   const color =
     compiledSize > FILESIZE_BREAKPOINTS[1]
@@ -62,21 +60,12 @@ 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>
@@ -130,8 +119,8 @@ const DeployEditor = () => {
             className="hooks-editor"
             defaultLanguage={"wat"}
             language={"wat"}
-            path={`file://tmp/c/${activeFile?.name}.wat`}
+            path={`file://tmp/c/${snap.files?.[snap.active]?.name}.wat`}
-            value={activeFile?.compiledWatContent || ""}
+            value={snap.files?.[snap.active]?.compiledWatContent || ""}
             beforeMount={(monaco) => {
               monaco.languages.register({ id: "wat" });
               monaco.languages.setLanguageConfiguration("wat", wat.config);

components/DeployFooter.tsx

@@ -0,0 +1,103 @@
+import React, { useRef, useLayoutEffect } from "react";
+import { useSnapshot } from "valtio";
+import { Play, Prohibit } from "phosphor-react";
+import useStayScrolled from "react-stay-scrolled";
+
+import Container from "./Container";
+import Box from "./Box";
+import LogText from "./LogText";
+import { compileCode } from "../state/actions";
+import state from "../state";
+import Button from "./Button";
+import Heading from "./Heading";
+
+const Footer = () => {
+  const snap = useSnapshot(state);
+  const logRef = useRef<HTMLPreElement>(null);
+  const { stayScrolled /*, scrollBottom*/ } = useStayScrolled(logRef);
+
+  useLayoutEffect(() => {
+    stayScrolled();
+  }, [snap.logs, stayScrolled]);
+
+  return (
+    <Box
+      as="footer"
+      css={{
+        display: "flex",
+        borderTop: "1px solid $mauve6",
+        background: "$mauve1",
+        position: "relative",
+      }}
+    >
+      <Container css={{ py: "$3", flexShrink: 1 }}>
+        <Heading
+          as="h3"
+          css={{ fontWeight: 300, m: 0, fontSize: "11px", color: "$mauve9" }}
+        >
+          DEVELOPMENT LOG
+        </Heading>
+        <Button
+          ghost
+          size="xs"
+          css={{
+            position: "absolute",
+            right: "$3",
+            top: "$2",
+            color: "$mauve10",
+          }}
+          onClick={() => {
+            state.logs = [];
+          }}
+        >
+          <Prohibit size="14px" />
+        </Button>
+        <Box
+          as="pre"
+          ref={logRef}
+          css={{
+            display: "flex",
+            flexDirection: "column",
+            width: "100%",
+            height: "160px",
+            fontSize: "13px",
+            fontWeight: "$body",
+            fontFamily: "$monospace",
+            overflowY: "auto",
+            wordWrap: "break-word",
+            py: 3,
+          }}
+        >
+          {snap.logs?.map((log, index) => (
+            <Box as="span" key={log.type + index}>
+              <LogText capitalize variant={log.type}>
+                {log.type}:{" "}
+              </LogText>
+              <LogText>{log.message}</LogText>
+            </Box>
+          ))}
+        </Box>
+        <Button
+          variant="primary"
+          uppercase
+          disabled={!snap.files.length}
+          isLoading={snap.compiling}
+          onClick={() => compileCode(snap.active)}
+          css={{
+            position: "absolute",
+            bottom: "$4",
+            left: "$4",
+            alignItems: "center",
+            display: "flex",
+            cursor: "pointer",
+          }}
+        >
+          <Play weight="bold" size="16px" />
+          Compile to Wasm
+        </Button>
+      </Container>
+    </Box>
+  );
+};
+
+export default Footer;

components/Dialog.tsx

@@ -40,7 +40,6 @@ const StyledContent = styled(DialogPrimitive.Content, {
   color: "$mauve12",
   borderRadius: "$md",
   position: "relative",
-  mb: "15%",
   boxShadow:
     "0px 10px 38px -5px rgba(22, 23, 24, 0.25), 0px 10px 20px -5px rgba(22, 23, 24, 0.2)",
   width: "90vw",

components/EditorNavigation.tsx

@@ -47,11 +47,18 @@ import {
 } from "./Dialog";
 import Flex from "./Flex";
 import Stack from "./Stack";
-import { Input, Label } from "./Input";
+import Input from "./Input";
 import Text from "./Text";
 import Tooltip from "./Tooltip";
+import {
+  AlertDialog,
+  AlertDialogContent,
+  AlertDialogTitle,
+  AlertDialogDescription,
+  AlertDialogCancel,
+  AlertDialogAction,
+} from "./AlertDialog";
 import { styled } from "../stitches.config";
-import { showAlert } from "../state/actions/showAlert";
 
 const ErrorText = styled(Text, {
   color: "$error",
@@ -61,6 +68,7 @@ const ErrorText = styled(Text, {
 
 const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
   const snap = useSnapshot(state);
+  const [createNewAlertOpen, setCreateNewAlertOpen] = useState(false);
   const [editorSettingsOpen, setEditorSettingsOpen] = useState(false);
   const [isNewfileDialogOpen, setIsNewfileDialogOpen] = useState(false);
   const [newfileError, setNewfileError] = useState<string | null>(null);
@@ -79,29 +87,13 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
     setNewfileError(null);
   }, [filename, setNewfileError]);
 
-  const showNewGistAlert = () => {
-    showAlert("Are you sure?", {
-      body: (
-        <>
-          This action will create new <strong>public</strong> Github Gist from
-          your current saved files. You can delete gist anytime from your GitHub
-          Gists page.
-        </>
-      ),
-      cancelText: "Cancel",
-      confirmText: "Create new Gist",
-      confirmPrefix: <FilePlus size="15px" />,
-      onConfirm: () => syncToGist(session, true),
-    });
-  };
-
   const validateFilename = useCallback(
     (filename: string): { error: string | null } => {
       // check if filename already exists
       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." };
       }
 
@@ -230,11 +222,11 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
                 <DialogContent>
                   <DialogTitle>Create new file</DialogTitle>
                   <DialogDescription>
-                    <Label>Filename</Label>
+                    <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();
                         }
@@ -424,7 +416,7 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
                   if (snap.gistOwner === session?.user.username) {
                     syncToGist(session);
                   } else {
-                    showNewGistAlert();
+                    setCreateNewAlertOpen(true);
                   }
                 }}
               >
@@ -474,7 +466,7 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
                 <DropdownMenuItem
                   disabled={status !== "authenticated"}
                   onClick={() => {
-                    showNewGistAlert();
+                    setCreateNewAlertOpen(true);
                   }}
                 >
                   <FilePlus size="16px" /> Create as a new Gist
@@ -494,6 +486,34 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
           ) : null}
         </Container>
       </Flex>
+      <AlertDialog
+        open={createNewAlertOpen}
+        onOpenChange={(value) => setCreateNewAlertOpen(value)}
+      >
+        <AlertDialogContent>
+          <AlertDialogTitle>Are you sure?</AlertDialogTitle>
+          <AlertDialogDescription>
+            This action will create new <strong>public</strong> Github Gist from
+            your current saved files. You can delete gist anytime from your
+            GitHub Gists page.
+          </AlertDialogDescription>
+          <Flex css={{ justifyContent: "flex-end", gap: "$3" }}>
+            <AlertDialogCancel asChild>
+              <Button outline>Cancel</Button>
+            </AlertDialogCancel>
+            <AlertDialogAction asChild>
+              <Button
+                variant="primary"
+                onClick={() => {
+                  syncToGist(session, true);
+                }}
+              >
+                <FilePlus size="15px" /> Create new Gist
+              </Button>
+            </AlertDialogAction>
+          </Flex>
+        </AlertDialogContent>
+      </AlertDialog>
 
       <Dialog open={editorSettingsOpen} onOpenChange={setEditorSettingsOpen}>
         <DialogTrigger asChild>
@@ -504,13 +524,13 @@ const EditorNavigation = ({ showWat }: { showWat?: boolean }) => {
         <DialogContent>
           <DialogTitle>Editor settings</DialogTitle>
           <DialogDescription>
-            <Label>Tab size</Label>
+            <label>Tab size</label>
             <Input
               type="number"
               min="1"
               value={editorSettings.tabSize}
-              onChange={e =>
+              onChange={(e) =>
-                setEditorSettings(curr => ({
+                setEditorSettings((curr) => ({
                   ...curr,
                   tabSize: Number(e.target.value),
                 }))

components/HooksEditor.tsx

@@ -1,10 +1,11 @@
 import React, { useEffect, useRef } from "react";
 import { useSnapshot, ref } from "valtio";
-import Editor from "@monaco-editor/react";
+import Editor, { loader } from "@monaco-editor/react";
 import type monaco from "monaco-editor";
 import { ArrowBendLeftUp } from "phosphor-react";
 import { useTheme } from "next-themes";
 import { useRouter } from "next/router";
+import uniqBy from "lodash.uniqby";
 
 import Box from "./Box";
 import Container from "./Container";
@@ -23,6 +24,12 @@ import ReconnectingWebSocket from "reconnecting-websocket";
 
 import docs from "../xrpl-hooks-docs/docs";
 
+loader.config({
+  paths: {
+    vs: "https://cdn.jsdelivr.net/npm/monaco-editor@0.30.1/min/vs",
+  },
+});
+
 const validateWritability = (editor: monaco.editor.IStandaloneCodeEditor) => {
   const currPath = editor.getModel()?.uri.path;
   if (apiHeaderFiles.find((h) => currPath?.endsWith(h))) {
@@ -38,15 +45,18 @@ const setMarkers = (monacoE: typeof monaco) => {
   // Get all the markers that are active at the moment,
   // Also if same error is there twice, we can show the content
   // only once (that's why we're using uniqBy)
-  const markers = monacoE.editor
+  const markers = uniqBy(
-    .getModelMarkers({})
+    monacoE.editor
-    // Filter out the markers that are hooks specific
+      .getModelMarkers({})
-    .filter(
+      // Filter out the markers that are hooks specific
-      (marker) =>
+      .filter(
-        typeof marker?.code === "string" &&
+        (marker) =>
-        // Take only markers that starts with "hooks-"
+          typeof marker?.code === "string" &&
-        marker?.code?.includes("hooks-")
+          // Take only markers that starts with "hooks-"
-    );
+          marker?.code?.includes("hooks-")
+      ),
+    "code"
+  );
 
   // Get the active model (aka active file you're editing)
   // const model = monacoE.editor?.getModel(
@@ -164,21 +174,15 @@ const HooksEditor = () => {
                 onConnection: (connection) => {
                   // create and start the language client
                   const languageClient = createLanguageClient(connection);
-                  languageClient.start();
+                  const disposable = languageClient.start();
-                  // connection.onDispose((d) => {
+                  connection.onClose(() => {
-                  //   console.log("disposed: ", d);
+                    try {
-                  // });
+                      // disposable.stop();
-                  // connection.onError((ee) => {
+                      disposable.dispose();
-                  //   console.log(ee =)
+                    } catch (err) {
-                  // })
+                      console.log("err", err);
-                  // connection.onClose(() => {
+                    }
-                  //   try {
+                  });
-                  //     // disposable.stop();
-                  //     disposable.dispose();
-                  //   } catch (err) {
-                  //     console.log("err", err);
-                  //   }
-                  // });
                 },
               });
             }

components/Input.tsx

@@ -1,6 +1,5 @@
 import React from "react";
 import { styled } from "../stitches.config";
-import * as LabelPrim from '@radix-ui/react-label';
 
 export const Input = styled("input", {
   // Reset
@@ -159,11 +158,3 @@ const ReffedInput = React.forwardRef<
 >((props, ref) => <Input {...props} ref={ref} />);
 
 export default ReffedInput;
-
-
-const LabelRoot = (props: LabelPrim.LabelProps) => <LabelPrim.Root {...props} />
-
-export const Label = styled(LabelRoot, {
-  display: 'inline-block',
-  mb: '$1'
-})

components/LogBox.tsx

@@ -147,7 +147,7 @@ const LogBox: FC<ILogBox> = ({
 
 export const Log: FC<ILog> = ({
   type,
-  timestring,
+  timestamp: timestamp,
   message: _message,
   link,
   linkText,
@@ -186,17 +186,8 @@ export const Log: FC<ILog> = ({
     },
     [accounts]
   );
-
+  _message = _message.trim().replace(/\n /gi, "\n");
-  let message: ReactNode;
+  const message = enrichAccounts(_message);
-  
-  if (typeof _message === 'string') {
-    _message = _message.trim().replace(/\n /gi, "\n");
-    message = enrichAccounts(_message)
-  }
-  else {
-    message = _message
-  }
-
   const jsonData = enrichAccounts(_jsonData);
 
   return (
@@ -206,9 +197,9 @@ export const Log: FC<ILog> = ({
         activeAccountAddress={dialogAccount}
       />
       <LogText variant={type}>
-        {timestring && (
+        {timestamp && (
           <Text muted monospace>
-            {timestring}{" "}
+            {timestamp}{" "}
           </Text>
         )}
         <Pre>{message} </Pre>

components/LogBoxForScripts.tsx

@@ -1,234 +0,0 @@
-import {
-  useRef,
-  useLayoutEffect,
-  ReactNode,
-  FC,
-  useState,
-  useCallback,
-} from "react";
-import { FileJs, Prohibit } from "phosphor-react";
-import useStayScrolled from "react-stay-scrolled";
-import NextLink from "next/link";
-
-import Container from "./Container";
-import LogText from "./LogText";
-import state, { ILog } from "../state";
-import { Pre, Link, Heading, Button, Text, Flex, Box } from ".";
-import regexifyString from "regexify-string";
-import { useSnapshot } from "valtio";
-import { AccountDialog } from "./Accounts";
-import RunScript from "./RunScript";
-
-interface ILogBox {
-  title: string;
-  clearLog?: () => void;
-  logs: ILog[];
-  renderNav?: () => ReactNode;
-  enhanced?: boolean;
-  showButtons?: boolean;
-}
-
-const LogBox: FC<ILogBox> = ({
-  title,
-  clearLog,
-  logs,
-  children,
-  renderNav,
-  enhanced,
-  showButtons = true,
-}) => {
-  const logRef = useRef<HTMLPreElement>(null);
-  const { stayScrolled /*, scrollBottom*/ } = useStayScrolled(logRef);
-  const snap = useSnapshot(state);
-  useLayoutEffect(() => {
-    stayScrolled();
-  }, [stayScrolled, logs]);
-
-  return (
-    <Flex
-      as="div"
-      css={{
-        display: "flex",
-        borderTop: "1px solid $mauve6",
-        background: "$mauve1",
-        position: "relative",
-        flex: 1,
-        height: "100%",
-      }}
-    >
-      <Container
-        css={{
-          px: 0,
-          height: "100%",
-        }}
-      >
-        <Flex
-          fluid
-          css={{
-            height: "48px",
-            alignItems: "center",
-            fontSize: "$sm",
-            fontWeight: 300,
-          }}
-        >
-          <Heading
-            as="h3"
-            css={{
-              fontWeight: 300,
-              m: 0,
-              fontSize: "11px",
-              color: "$mauve12",
-              px: "$3",
-              textTransform: "uppercase",
-              alignItems: "center",
-              display: "inline-flex",
-              gap: "$3",
-              mr: "$3",
-            }}
-          >
-            <FileJs size="15px" /> <Text css={{ lineHeight: 1 }}>{title}</Text>
-          </Heading>
-          {showButtons && (
-            <Flex css={{ gap: "$3" }}>
-              {snap.files
-                .filter((f) => f.name.endsWith(".js"))
-                .map((file) => (
-                  <RunScript file={file} key={file.name} />
-                ))}
-            </Flex>
-          )}
-          <Flex css={{ ml: "auto", gap: "$3", marginRight: "$3" }}>
-            {clearLog && (
-              <Button ghost size="xs" onClick={clearLog}>
-                <Prohibit size="14px" />
-              </Button>
-            )}
-          </Flex>
-        </Flex>
-        <Box
-          as="pre"
-          ref={logRef}
-          css={{
-            margin: 0,
-            // display: "inline-block",
-            display: "flex",
-            flexDirection: "column",
-            width: "100%",
-            height: "calc(100% - 48px)", // 100% minus the logbox header height
-            overflowY: "auto",
-            fontSize: "13px",
-            fontWeight: "$body",
-            fontFamily: "$monospace",
-            px: "$3",
-            pb: "$2",
-            whiteSpace: "normal",
-          }}
-        >
-          {logs?.map((log, index) => (
-            <Box
-              as="span"
-              key={log.type + index}
-              css={{
-                "@hover": {
-                  "&:hover": {
-                    backgroundColor: enhanced ? "$backgroundAlt" : undefined,
-                  },
-                },
-                p: enhanced ? "$1" : undefined,
-                my: enhanced ? "$1" : undefined,
-              }}
-            >
-              <Log {...log} />
-            </Box>
-          ))}
-          {children}
-        </Box>
-      </Container>
-    </Flex>
-  );
-};
-
-export const Log: FC<ILog> = ({
-  type,
-  timestring,
-  message: _message,
-  link,
-  linkText,
-  defaultCollapsed,
-  jsonData: _jsonData,
-}) => {
-  const [expanded, setExpanded] = useState(!defaultCollapsed);
-  const { accounts } = useSnapshot(state);
-  const [dialogAccount, setDialogAccount] = useState<string | null>(null);
-
-  const enrichAccounts = useCallback(
-    (str?: string): ReactNode => {
-      if (!str || !accounts.length) return null;
-
-      const pattern = `(${accounts.map((acc) => acc.address).join("|")})`;
-      const res = regexifyString({
-        pattern: new RegExp(pattern, "gim"),
-        decorator: (match, idx) => {
-          const name = accounts.find((acc) => acc.address === match)?.name;
-          return (
-            <Link
-              key={match + idx}
-              as="a"
-              onClick={() => setDialogAccount(match)}
-              title={match}
-              highlighted
-            >
-              {name || match}
-            </Link>
-          );
-        },
-        input: str,
-      });
-
-      return <>{res}</>;
-    },
-    [accounts]
-  );
-
-  let message: ReactNode;
-
-  if (typeof _message === "string") {
-    _message = _message.trim().replace(/\n /gi, "\n");
-    message = enrichAccounts(_message);
-  } else {
-    message = _message;
-  }
-
-  const jsonData = enrichAccounts(_jsonData);
-
-  return (
-    <>
-      <AccountDialog
-        setActiveAccountAddress={setDialogAccount}
-        activeAccountAddress={dialogAccount}
-      />
-      <LogText variant={type}>
-        {timestring && (
-          <Text muted monospace>
-            {timestring}{" "}
-          </Text>
-        )}
-        <Pre>{message} </Pre>
-        {link && (
-          <NextLink href={link} shallow passHref>
-            <Link as="a">{linkText}</Link>
-          </NextLink>
-        )}
-        {jsonData && (
-          <Link onClick={() => setExpanded(!expanded)} as="a">
-            {expanded ? "Collapse" : "Expand"}
-          </Link>
-        )}
-        {expanded && jsonData && <Pre block>{jsonData}</Pre>}
-      </LogText>
-      <br />
-    </>
-  );
-};
-
-export default LogBox;

components/Navigation.tsx

@@ -28,28 +28,6 @@ import {
 } from "./Dialog";
 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",
-  mb: "$10",
-  svg: {
-    // fill: "red",
-    ".angle": {
-      fill: "$text",
-    },
-    ":not(.angle)": {
-      stroke: "$text",
-    },
-  },
-});
 
 const Navigation = () => {
   const router = useRouter();
@@ -113,7 +91,7 @@ const Navigation = () => {
                 <Text
                   css={{ fontSize: "$xs", color: "$mauve10", lineHeight: 1 }}
                 >
-                  {snap.files.length > 0 ? "Gist: " : "Builder"}
+                  {snap.files.length > 0 ? "Gist: " : "Playground"}
                   {snap.files.length > 0 && (
                     <Link
                       href={`https://gist.github.com/${snap.gistOwner || ""}/${
@@ -150,20 +128,19 @@ const Navigation = () => {
                 </DialogTrigger>
                 <DialogContent
                   css={{
-                    display: "flex",
                     maxWidth: "1080px",
                     width: "80vw",
-                    maxHeight: "80%",
+                    height: "80%",
                     backgroundColor: "$mauve1 !important",
                     overflowY: "auto",
-                    background: "black",
                     p: 0,
                   }}
                 >
                   <Flex
                     css={{
                       flexDirection: "column",
-                      height: "100%",
+                      flex: 1,
+                      height: "auto",
                       "@md": {
                         flexDirection: "row",
                         height: "100%",
@@ -174,15 +151,15 @@ const Navigation = () => {
                       css={{
                         borderBottom: "1px solid $colors$mauve5",
                         width: "100%",
-                        minWidth: "240px",
                         flexDirection: "column",
                         p: "$7",
+                        height: "100%",
                         backgroundColor: "$mauve2",
                         "@md": {
                           width: "30%",
                           maxWidth: "300px",
                           borderBottom: "0px",
-                          borderRight: "1px solid $colors$mauve5",
+                          borderRight: "1px solid $colors$mauve6",
                         },
                       }}
                     >
@@ -219,9 +196,9 @@ const Navigation = () => {
                               display: "inline-flex",
                               alignItems: "center",
                               gap: "$3",
-                              color: "$purple11",
+                              color: "$purple10",
                               "&:hover": {
-                                color: "$purple12",
+                                color: "$purple11",
                               },
                               "&:focus": {
                                 outline: 0,
@@ -240,9 +217,9 @@ const Navigation = () => {
                               display: "inline-flex",
                               alignItems: "center",
                               gap: "$3",
-                              color: "$purple11",
+                              color: "$purple10",
                               "&:hover": {
-                                color: "$purple12",
+                                color: "$purple11",
                               },
                               "&:focus": {
                                 outline: 0,
@@ -260,9 +237,9 @@ const Navigation = () => {
                               display: "inline-flex",
                               alignItems: "center",
                               gap: "$3",
-                              color: "$purple11",
+                              color: "$purple10",
                               "&:hover": {
-                                color: "$purple12",
+                                color: "$purple11",
                               },
                               "&:focus": {
                                 outline: 0,
@@ -278,90 +255,67 @@ const Navigation = () => {
                         </Flex>
                       </DialogDescription>
                     </Flex>
-
+                    <div>
-                    <Flex
+                      <Flex
-                      css={{
+                        css={{
-                        display: "grid",
+                          display: "grid",
-                        gridTemplateColumns: "1fr",
+                          gridTemplateColumns: "1fr",
-                        gridTemplateRows: "max-content",
-                        flex: 1,
-                        p: "$7",
-                        pb: "$16",
-                        gap: "$3",
-                        alignItems: "normal",
-                        flexWrap: "wrap",
-                        backgroundColor: "$mauve1",
-                        "@md": {
-                          gridTemplateColumns: "1fr 1fr",
                           gridTemplateRows: "max-content",
-                        },
+                          flex: 1,
-                        "@lg": {
+                          p: "$7",
-                          gridTemplateColumns: "1fr 1fr 1fr",
+                          gap: "$3",
-                          gridTemplateRows: "max-content",
+                          alignItems: "normal",
-                        },
+                          flexWrap: "wrap",
-                      }}
+                          backgroundColor: "$mauve1",
-                    >
+                          "@md": {
-                      <PanelBox
+                            gridTemplateColumns: "1fr 1fr 1fr",
-                        as="a"
+                            gridTemplateRows: "max-content",
-                        href={`/develop/${templateFileIds.starter}`}
+                          },
+                        }}
                       >
-                        <ImageWrapper>
+                        <PanelBox
-                          <Starter />
+                          as="a"
-                        </ImageWrapper>
+                          href={`/develop/${templateFileIds.starter}`}
-                        <Heading>Starter</Heading>
+                        >
-
+                          <Heading>Starter</Heading>
-                        <Text>
+                          <Text>
-                          Just a basic starter with essential imports, just
+                            Just a basic starter with essential imports
-                          accepts any transaction coming through
+                          </Text>
-                        </Text>
+                        </PanelBox>
-                      </PanelBox>
+                        <PanelBox
-
+                          as="a"
-                      <PanelBox
+                          href={`/develop/${templateFileIds.firewall}`}
-                        as="a"
+                        >
-                        href={`/develop/${templateFileIds.firewall}`}
+                          <Heading>Firewall</Heading>
-                        css={{ alignItems: "flex-start" }}
+                          <Text>
-                      >
+                            This Hook essentially checks a blacklist of accounts
-                        <ImageWrapper>
+                          </Text>
-                          <Firewall />
+                        </PanelBox>
-                        </ImageWrapper>
+                        <PanelBox
-                        <Heading>Firewall</Heading>
+                          as="a"
-                        <Text>
+                          href={`/develop/${templateFileIds.notary}`}
-                          This Hook essentially checks a blacklist of accounts
+                        >
-                        </Text>
+                          <Heading>Notary</Heading>
-                      </PanelBox>
+                          <Text>
-                      <PanelBox
+                            Collecting signatures for multi-sign transactions
-                        as="a"
+                          </Text>
-                        href={`/develop/${templateFileIds.notary}`}
+                        </PanelBox>
-                      >
+                        <PanelBox
-                        <ImageWrapper>
+                          as="a"
-                          <Notary />
+                          href={`/develop/${templateFileIds.carbon}`}
-                        </ImageWrapper>
+                        >
-                        <Heading>Notary</Heading>
+                          <Heading>Carbon</Heading>
-                        <Text>
+                          <Text>Send a percentage of sum to an address</Text>
-                          Collecting signatures for multi-sign transactions
+                        </PanelBox>
-                        </Text>
+                        <PanelBox
-                      </PanelBox>
+                          as="a"
-                      <PanelBox
+                          href={`/develop/${templateFileIds.peggy}`}
-                        as="a"
+                        >
-                        href={`/develop/${templateFileIds.carbon}`}
+                          <Heading>Peggy</Heading>
-                      >
+                          <Text>An oracle based stable coin hook</Text>
-                        <ImageWrapper>
+                        </PanelBox>
-                          <Carbon />
+                      </Flex>
-                        </ImageWrapper>
+                    </div>
-                        <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>
-                    </Flex>
                   </Flex>
                   <DialogClose asChild>
                     <Box

components/Popover.tsx

@@ -1,109 +0,0 @@
-import React, { ReactNode } from "react";
-import * as PopoverPrimitive from "@radix-ui/react-popover";
-import { styled, keyframes } from "../stitches.config";
-
-const slideUpAndFade = keyframes({
-  "0%": { opacity: 0, transform: "translateY(2px)" },
-  "100%": { opacity: 1, transform: "translateY(0)" },
-});
-
-const slideRightAndFade = keyframes({
-  "0%": { opacity: 0, transform: "translateX(-2px)" },
-  "100%": { opacity: 1, transform: "translateX(0)" },
-});
-
-const slideDownAndFade = keyframes({
-  "0%": { opacity: 0, transform: "translateY(-2px)" },
-  "100%": { opacity: 1, transform: "translateY(0)" },
-});
-
-const slideLeftAndFade = keyframes({
-  "0%": { opacity: 0, transform: "translateX(2px)" },
-  "100%": { opacity: 1, transform: "translateX(0)" },
-});
-const StyledContent = styled(PopoverPrimitive.Content, {
-  borderRadius: 4,
-  padding: "$3 $3",
-  fontSize: 12,
-  lineHeight: 1,
-  color: "$text",
-  backgroundColor: "$background",
-  boxShadow:
-    "0px 10px 38px -10px rgba(22, 23, 24, 0.35), 0px 10px 20px -15px rgba(22, 23, 24, 0.2)",
-  "@media (prefers-reduced-motion: no-preference)": {
-    animationDuration: "400ms",
-    animationTimingFunction: "cubic-bezier(0.16, 1, 0.3, 1)",
-    willChange: "transform, opacity",
-    '&[data-state="open"]': {
-      '&[data-side="top"]': { animationName: slideDownAndFade },
-      '&[data-side="right"]': { animationName: slideLeftAndFade },
-      '&[data-side="bottom"]': { animationName: slideUpAndFade },
-      '&[data-side="left"]': { animationName: slideRightAndFade },
-    },
-  },
-  ".dark &": {
-    backgroundColor: "$mauve5",
-    boxShadow:
-      "0px 5px 38px -2px rgba(22, 23, 24, 1), 0px 10px 20px 0px rgba(22, 23, 24, 1)",
-  },
-});
-
-const StyledArrow = styled(PopoverPrimitive.Arrow, {
-  fill: "$colors$mauve2",
-  ".dark &": {
-    fill: "$mauve5",
-  },
-});
-
-const StyledClose = styled(PopoverPrimitive.Close, {
-  all: "unset",
-  fontFamily: "inherit",
-  borderRadius: "100%",
-  height: 25,
-  width: 25,
-  display: "inline-flex",
-  alignItems: "center",
-  justifyContent: "center",
-  color: "$text",
-  position: "absolute",
-  top: 5,
-  right: 5,
-});
-
-// Exports
-export const PopoverRoot = PopoverPrimitive.Root;
-export const PopoverTrigger = PopoverPrimitive.Trigger;
-export const PopoverContent = StyledContent;
-export const PopoverArrow = StyledArrow;
-export const PopoverClose = StyledClose;
-
-interface IPopover {
-  content: string | ReactNode;
-  open?: boolean;
-  defaultOpen?: boolean;
-  onOpenChange?: (open: boolean) => void;
-}
-
-const Popover: React.FC<
-  IPopover & React.ComponentProps<typeof PopoverContent>
-> = ({
-  children,
-  content,
-  open,
-  defaultOpen = false,
-  onOpenChange,
-  ...rest
-}) => (
-  <PopoverRoot
-    open={open}
-    defaultOpen={defaultOpen}
-    onOpenChange={onOpenChange}
-  >
-    <PopoverTrigger asChild>{children}</PopoverTrigger>
-    <PopoverContent sideOffset={5} {...rest}>
-      {content} <PopoverArrow offset={5} className="arrow" />
-    </PopoverContent>
-  </PopoverRoot>
-);
-
-export default Popover;

components/RunScript/index.tsx

@@ -1,314 +0,0 @@
-import * as Handlebars from "handlebars";
-import { Play, X } from "phosphor-react";
-import { useCallback, useEffect, useState } from "react";
-import state, { IFile, ILog } from "../../state";
-import Button from "../Button";
-import Box from "../Box";
-import Input from "../Input";
-import Stack from "../Stack";
-import {
-  Dialog,
-  DialogTrigger,
-  DialogContent,
-  DialogTitle,
-  DialogDescription,
-  DialogClose,
-} from "../Dialog";
-import Flex from "../Flex";
-import { useSnapshot } from "valtio";
-import Select from "../Select";
-import { saveFile } from "../../state/actions/saveFile";
-
-Handlebars.registerHelper(
-  "customize_input",
-  function (/* dynamic arguments */) {
-    return new Handlebars.SafeString(arguments[0]);
-  }
-);
-
-const generateHtmlTemplate = (code: string) => {
-  return `
-  <html>
-  <head>
-    <script>
-      var log = console.log;
-      var errorLog = console.error;
-      var infoLog = console.info;
-      var warnLog = console.warn
-      console.log = function(){
-        var args = Array.from(arguments);
-        parent.window.postMessage({ type: 'log', args: args || [] }, '*');
-        log.apply(console, args);
-      }
-      console.error = function(){
-        var args = Array.from(arguments);
-        parent.window.postMessage({ type: 'error', args: args || [] }, '*');
-        errorLog.apply(console, args);
-      }
-      console.info = function(){
-        var args = Array.from(arguments);
-        parent.window.postMessage({ type: 'info', args: args || [] }, '*');
-        infoLog.apply(console, args);
-      }
-      console.warn = function(){
-        var args = Array.from(arguments);
-        parent.window.postMessage({ type: 'warning', args: args || [] }, '*');
-        warnLog.apply(console, args);
-      }
-    </script>
-    <script type="module">   
-      ${code}
-    </script>
-  </head>
-  <body>
-  </body>
-  </html>
-  `;
-};
-
-type Fields = Record<
-  string,
-  {
-    key: string;
-    value: string;
-    label?: string;
-    type?: string;
-    attach?: "account_secret" | "account_address" | string;
-  }
->;
-
-const RunScript: React.FC<{ file: IFile }> = ({ file: { content, name } }) => {
-  const snap = useSnapshot(state);
-  const [templateError, setTemplateError] = useState("");
-  const getFieldValues = useCallback(() => {
-    try {
-      const parsed = Handlebars.parse(content);
-      const names = parsed.body
-        .filter((i) => i.type === "MustacheStatement")
-        .map((block) => {
-          // @ts-expect-error
-          const type = block.hash?.pairs?.find((i) => i.key == "type");
-          // @ts-expect-error
-          const attach = block.hash?.pairs?.find((i) => i.key == "attach");
-          // @ts-expect-error
-          const label = block.hash?.pairs?.find((i) => i.key == "label");
-          const key =
-            // @ts-expect-error
-            block?.path?.original === "customize_input"
-              ? // @ts-expect-error
-                block?.params?.[0].original
-              : // @ts-expect-error
-                block?.path?.original;
-          return {
-            key,
-            label: label?.value?.original || key,
-            attach: attach?.value?.original,
-            type: type?.value?.original,
-            value: "",
-          };
-        });
-      const defaultState: Fields = {};
-
-      if (names) {
-        names.forEach((field) => (defaultState[field.key] = field));
-      }
-      setTemplateError("");
-      return defaultState;
-    } catch (err) {
-      console.log(err);
-      setTemplateError("Could not parse template");
-      return undefined;
-    }
-  }, [content]);
-
-  // const defaultFieldValues = getFieldValues();
-
-  const [fields, setFields] = useState<Fields>({});
-  const [iFrameCode, setIframeCode] = useState("");
-  const [isDialogOpen, setIsDialogOpen] = useState(false);
-  const runScript = () => {
-    const fieldsToSend: Record<string, string> = {};
-    Object.entries(fields).map(([key, obj]) => {
-      fieldsToSend[key] = obj.value;
-    });
-    const template = Handlebars.compile(content, { strict: false });
-    try {
-      const code = template(fieldsToSend);
-      setIframeCode(generateHtmlTemplate(code));
-      state.scriptLogs = [
-        ...snap.scriptLogs,
-        { type: "success", message: "Started running..." },
-      ];
-    } catch (err) {
-      state.scriptLogs = [
-        ...snap.scriptLogs,
-        // @ts-expect-error
-        { type: "error", message: err?.message || "Could not parse template" },
-      ];
-    }
-  };
-
-  useEffect(() => {
-    const handleEvent = (e: any) => {
-      if (e.data.type === "log" || e.data.type === "error") {
-        const data: ILog[] = e.data.args.map((msg: any) => ({
-          type: e.data.type,
-          message: typeof msg === "string" ? msg : JSON.stringify(msg, null, 2),
-        }));
-        state.scriptLogs = [...snap.scriptLogs, ...data];
-      }
-    };
-    window.addEventListener("message", handleEvent);
-    return () => window.removeEventListener("message", handleEvent);
-  }, [snap.scriptLogs]);
-
-  useEffect(() => {
-    const newDefaultState = getFieldValues();
-    setFields(newDefaultState || {});
-  }, [content, setFields, getFieldValues]);
-
-  const options = snap.accounts?.map((acc) => ({
-    label: acc.name,
-    secret: acc.secret,
-    address: acc.address,
-    value: acc.address,
-  }));
-
-  return (
-    <>
-      <Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
-        <DialogTrigger asChild>
-          <Button
-            variant="primary"
-            onClick={() => {
-              saveFile(false);
-              setIframeCode("");
-            }}
-          >
-            <Play weight="bold" size="16px" /> {name}
-          </Button>
-        </DialogTrigger>
-        <DialogContent>
-          <DialogTitle>Run {name} script</DialogTitle>
-          <DialogDescription>
-            You are about to run scripts provided by the developer of the hook,
-            make sure you know what you are doing.
-            <br />
-            {templateError && (
-              <Box
-                as="span"
-                css={{ display: "block", color: "$error", mt: "$3" }}
-              >
-                Error occured while parsing template, modify script and try
-                again!
-              </Box>
-            )}
-            <br />
-            {Object.keys(fields).length > 0
-              ? `You also need to fill in following parameters to run the script`
-              : ""}
-          </DialogDescription>
-          <Stack css={{ width: "100%" }}>
-            {Object.keys(fields).map((key) => (
-              <Box key={key} css={{ width: "100%" }}>
-                <label>
-                  {fields[key]?.label || key}{" "}
-                  {fields[key].attach === "account_secret" &&
-                    `(Script uses account secret)`}
-                </label>
-                {fields[key].attach === "account_secret" ||
-                fields[key].attach === "account_address" ? (
-                  <Select
-                    css={{ mt: "$1" }}
-                    options={options}
-                    onChange={(val: any) => {
-                      setFields({
-                        ...fields,
-                        [key]: {
-                          ...fields[key],
-                          value:
-                            fields[key].attach === "account_secret"
-                              ? val.secret
-                              : val.address,
-                        },
-                      });
-                    }}
-                    value={options.find(
-                      (opt) =>
-                        opt.address === fields[key].value ||
-                        opt.secret === fields[key].value
-                    )}
-                  />
-                ) : (
-                  <Input
-                    type={fields[key].type || "text"}
-                    value={
-                      typeof fields[key].value !== "string"
-                        ? // @ts-expect-error
-                          fields[key].value.value
-                        : fields[key].value
-                    }
-                    css={{ mt: "$1" }}
-                    onChange={(e) => {
-                      setFields({
-                        ...fields,
-                        [key]: { ...fields[key], value: e.target.value },
-                      });
-                    }}
-                  />
-                )}
-              </Box>
-            ))}
-            <Flex
-              css={{ justifyContent: "flex-end", width: "100%", gap: "$3" }}
-            >
-              <DialogClose asChild>
-                <Button outline>Cancel</Button>
-              </DialogClose>
-              <Button
-                variant="primary"
-                isDisabled={
-                  (Object.entries(fields).length > 0 &&
-                    Object.entries(fields).some(([key, obj]) => !obj.value)) ||
-                  Boolean(templateError)
-                }
-                onClick={() => {
-                  state.scriptLogs = [];
-                  runScript();
-                  setIsDialogOpen(false);
-                }}
-              >
-                Run script
-              </Button>
-            </Flex>
-          </Stack>
-          <DialogClose asChild>
-            <Box
-              css={{
-                position: "absolute",
-                top: "$1",
-                right: "$1",
-                cursor: "pointer",
-                background: "$mauve1",
-                display: "flex",
-                borderRadius: "$full",
-                p: "$1",
-              }}
-            >
-              <X size="20px" />
-            </Box>
-          </DialogClose>
-        </DialogContent>
-      </Dialog>
-      {iFrameCode && (
-        <iframe
-          style={{ display: "none" }}
-          srcDoc={iFrameCode}
-          sandbox="allow-scripts"
-        />
-      )}
-    </>
-  );
-};
-
-export default RunScript;

components/Select.tsx

@@ -52,7 +52,6 @@ const Select = forwardRef<any, Props>((props, ref) => {
         control: (provided, state) => {
           return {
             ...provided,
-            minHeight: 0,
             border: "0px",
             backgroundColor: colors.mauve4,
             boxShadow: `0 0 0 1px ${
@@ -119,6 +118,32 @@ const Select = forwardRef<any, Props>((props, ref) => {
           };
         },
       }}
+      // theme={(theme) => ({
+      //   ...theme,
+      //   spacing: {
+      //     ...theme.spacing,
+      //     controlHeight: 30,
+      //   },
+      //   colors: {
+      //     primary: colors.selected,
+      //     primary25: colors.active,
+      //     primary50: colors.primary,
+      //     primary75: colors.primary,
+      //     danger: colors.primary,
+      //     dangerLight: colors.primary,
+      //     neutral0: colors.background,
+      //     neutral5: colors.primary,
+      //     neutral10: colors.primary,
+      //     neutral20: colors.outline,
+      //     neutral30: colors.primary,
+      //     neutral40: colors.primary,
+      //     neutral50: colors.placeholder,
+      //     neutral60: colors.primary,
+      //     neutral70: colors.primary,
+      //     neutral80: colors.searchText,
+      //     neutral90: colors.primary,
+      //   },
+      // })}
       {...props}
     />
   );

components/SetHookDialog.tsx

@@ -11,7 +11,7 @@ import {
   DialogClose,
   DialogTrigger,
 } from "./Dialog";
-import { Input, Label } from "./Input";
+import { Input } from "./Input";
 import {
   Controller,
   SubmitHandler,
@@ -21,11 +21,11 @@ import {
 
 import { TTS, tts } from "../utils/hookOnCalculator";
 import { deployHook } from "../state/actions";
+import type { IAccount } from "../state";
 import { useSnapshot } from "valtio";
 import state from "../state";
 import toast from "react-hot-toast";
-import { prepareDeployHookTx, sha256 } from "../state/actions/deployHook";
+import { sha256 } from "../state/actions/deployHook";
-import estimateFee from "../utils/estimateFee";
 
 const transactionOptions = Object.keys(tts).map((key) => ({
   label: key,
@@ -37,7 +37,6 @@ export type SetHookData = {
     value: keyof TTS;
     label: string;
   }[];
-  Fee: string;
   HookNamespace: string;
   HookParameters: {
     HookParameter: {
@@ -53,296 +52,167 @@ export type SetHookData = {
   // }[];
 };
 
-export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
+export const SetHookDialog: React.FC<{ account: IAccount }> = ({ account }) => {
-  ({ accountAddress }) => {
+  const snap = useSnapshot(state);
-    const snap = useSnapshot(state);
+  const [isSetHookDialogOpen, setIsSetHookDialogOpen] = useState(false);
-    const account = snap.accounts.find((acc) => acc.address === accountAddress);
+  const {
+    register,
+    handleSubmit,
+    control,
+    watch,
+    formState: { errors },
+  } = useForm<SetHookData>({
+    defaultValues: {
+      HookNamespace: snap.files?.[snap.active]?.name?.split(".")?.[0] || "",
+    },
+  });
+  const { fields, append, remove } = useFieldArray({
+    control,
+    name: "HookParameters", // unique name for your Field Array
+  });
+  // const {
+  //   fields: grantFields,
+  //   append: grantAppend,
+  //   remove: grantRemove,
+  // } = useFieldArray({
+  //   control,
+  //   name: "HookGrants", // unique name for your Field Array
+  // });
+  const [hashedNamespace, setHashedNamespace] = useState("");
+  const namespace = watch(
+    "HookNamespace",
+    snap.files?.[snap.active]?.name?.split(".")?.[0] || ""
+  );
+  const calculateHashedValue = useCallback(async () => {
+    const hashedVal = await sha256(namespace);
+    setHashedNamespace(hashedVal.toUpperCase());
+  }, [namespace]);
+  useEffect(() => {
+    calculateHashedValue();
+  }, [namespace, calculateHashedValue]);
 
-    const [isSetHookDialogOpen, setIsSetHookDialogOpen] = useState(false);
+  if (!account) {
-    const {
+    return null;
-      register,
+  }
-      handleSubmit,
+
-      control,
+  const onSubmit: SubmitHandler<SetHookData> = async (data) => {
-      watch,
+    const currAccount = state.accounts.find(
-      setValue,
+      (acc) => acc.address === account.address
-      getValues,
-      formState: { errors },
-    } = useForm<SetHookData>({
-      defaultValues: {
-        HookNamespace:
-          snap.files?.[snap.activeWat]?.name?.split(".")?.[0] || "",
-        Invoke: transactionOptions.filter((to) => to.label === "ttPAYMENT"),
-      },
-    });
-    const { fields, append, remove } = useFieldArray({
-      control,
-      name: "HookParameters", // unique name for your Field Array
-    });
-    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] || ""
-      );
-      setFormInitialized(true);
-    }, [snap.activeWat, snap.files, setValue]);
-    useEffect(() => {
-      if (
-        watchedFee &&
-        (watchedFee.includes(".") || watchedFee.includes(","))
-      ) {
-        setValue("Fee", watchedFee.replaceAll(".", "").replaceAll(",", ""));
-      }
-    }, [watchedFee, setValue]);
-    // const {
-    //   fields: grantFields,
-    //   append: grantAppend,
-    //   remove: grantRemove,
-    // } = useFieldArray({
-    //   control,
-    //   name: "HookGrants", // unique name for your Field Array
-    // });
-    const [hashedNamespace, setHashedNamespace] = useState("");
-    const namespace = watch(
-      "HookNamespace",
-      snap.files?.[snap.active]?.name?.split(".")?.[0] || ""
     );
-    const calculateHashedValue = useCallback(async () => {
+    if (currAccount) currAccount.isLoading = true;
-      const hashedVal = await sha256(namespace);
+    const res = await deployHook(account, data);
-      setHashedNamespace(hashedVal.toUpperCase());
+    if (currAccount) currAccount.isLoading = false;
-    }, [namespace]);
-    useEffect(() => {
-      calculateHashedValue();
-    }, [namespace, calculateHashedValue]);
 
-    // Calcucate initial fee estimate when modal opens
+    if (res && res.engine_result === "tesSUCCESS") {
-    useEffect(() => {
+      toast.success("Transaction succeeded!");
-      if (formInitialized && account) {
+      return setIsSetHookDialogOpen(false);
-        (async () => {
-          const formValues = getValues();
-          const tx = await prepareDeployHookTx(account, formValues);
-          if (!tx) {
-            return;
-          }
-          const res = await estimateFee(tx, account);
-          if (res && res.base_fee) {
-            setValue("Fee", Math.round(Number(res.base_fee || "")).toString());
-          }
-        })();
-      }
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [formInitialized]);
-
-    if (!account) {
-      return null;
     }
+    toast.error(`Transaction failed! (${res?.engine_result_message})`);
+  };
 
-    const tooLargeFile = () => {
+  return (
-      const activeFile = snap.files[snap.active].compiledContent
+    <Dialog open={isSetHookDialogOpen} onOpenChange={setIsSetHookDialogOpen}>
-        ? snap.files[snap.active]
+      <DialogTrigger asChild>
-        : snap.files.filter((file) => file.compiledContent)[0];
+        <Button
-      return Boolean(
+          ghost
-        activeFile?.compiledContent?.byteLength &&
+          size="xs"
-          activeFile?.compiledContent?.byteLength >= 64000
+          uppercase
-      );
+          variant={"secondary"}
-    };
+          disabled={
-
+            account.isLoading ||
-    const onSubmit: SubmitHandler<SetHookData> = async (data) => {
+            !snap.files.filter((file) => file.compiledWatContent).length
-      const currAccount = state.accounts.find(
+          }
-        (acc) => acc.address === account.address
+        >
-      );
+          Set Hook
-      if (currAccount) currAccount.isLoading = true;
+        </Button>
-      const res = await deployHook(account, data);
+      </DialogTrigger>
-      if (currAccount) currAccount.isLoading = false;
+      <DialogContent>
-
+        <form onSubmit={handleSubmit(onSubmit)}>
-      if (res && res.engine_result === "tesSUCCESS") {
+          <DialogTitle>Deploy configuration</DialogTitle>
-        toast.success("Transaction succeeded!");
+          <DialogDescription as="div">
-        return setIsSetHookDialogOpen(false);
+            <Stack css={{ width: "100%", flex: 1 }}>
-      }
+              <Box css={{ width: "100%" }}>
-      toast.error(`Transaction failed! (${res?.engine_result_message})`);
+                <label>Invoke on transactions</label>
-    };
+                <Controller
-    return (
+                  name="Invoke"
-      <Dialog open={isSetHookDialogOpen} onOpenChange={setIsSetHookDialogOpen}>
+                  control={control}
-        <DialogTrigger asChild>
+                  defaultValue={transactionOptions.filter(
-          <Button
+                    (to) => to.label === "ttPAYMENT"
-            ghost
-            size="xs"
-            uppercase
-            variant={"secondary"}
-            disabled={
-              account.isLoading ||
-              !snap.files.filter((file) => file.compiledWatContent).length ||
-              tooLargeFile()
-            }
-          >
-            Set Hook
-          </Button>
-        </DialogTrigger>
-        <DialogContent>
-          <form onSubmit={handleSubmit(onSubmit)}>
-            <DialogTitle>Deploy configuration</DialogTitle>
-            <DialogDescription as="div">
-              <Stack css={{ width: "100%", flex: 1 }}>
-                <Box css={{ width: "100%" }}>
-                  <Label>Invoke on transactions</Label>
-                  <Controller
-                    name="Invoke"
-                    control={control}
-                    defaultValue={transactionOptions.filter(
-                      (to) => to.label === "ttPAYMENT"
-                    )}
-                    render={({ field }) => (
-                      <Select
-                        {...field}
-                        closeMenuOnSelect={false}
-                        isMulti
-                        menuPosition="fixed"
-                        options={transactionOptions}
-                      />
-                    )}
-                  />
-                </Box>
-                <Box css={{ width: "100%" }}>
-                  <Label>Hook Namespace Seed</Label>
-                  <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" }}>
-                      Namespace is required
-                    </Box>
                   )}
-                  <Box css={{ mt: "$3" }}>
+                  render={({ field }) => (
-                    <Label>Hook Namespace (sha256)</Label>
+                    <Select
-                    <Input readOnly value={hashedNamespace} />
+                      {...field}
-                  </Box>
+                      closeMenuOnSelect={false}
-                </Box>
+                      isMulti
-
+                      menuPosition="fixed"
-                <Box css={{ width: "100%" }}>
+                      options={transactionOptions}
-                  <Label style={{ marginBottom: "10px", display: "block" }}>
-                    Hook parameters
-                  </Label>
-                  <Stack>
-                    {fields.map((field, index) => (
-                      <Stack key={field.id}>
-                        <Input
-                          // important to include key with field's id
-                          placeholder="Parameter name"
-                          {...register(
-                            `HookParameters.${index}.HookParameter.HookParameterName`
-                          )}
-                        />
-                        <Input
-                          placeholder="Value (hex-quoted)"
-                          {...register(
-                            `HookParameters.${index}.HookParameter.HookParameterValue`
-                          )}
-                        />
-                        <Button onClick={() => remove(index)} variant="destroy">
-                          <Trash weight="regular" size="16px" />
-                        </Button>
-                      </Stack>
-                    ))}
-                    <Button
-                      outline
-                      fullWidth
-                      type="button"
-                      onClick={() =>
-                        append({
-                          HookParameter: {
-                            HookParameterName: "",
-                            HookParameterValue: "",
-                          },
-                        })
-                      }
-                    >
-                      <Plus size="16px" />
-                      Add Hook Parameter
-                    </Button>
-                  </Stack>
-                </Box>
-                <Box css={{ width: "100%", position: "relative" }}>
-                  <Label>Fee</Label>
-                  <Box css={{ display: "flex", alignItems: "center" }}>
-                    <Input
-                      type="number"
-                      {...register("Fee", { required: true })}
-                      autoComplete={"off"}
-                      onKeyPress={(e) => {
-                        if (e.key === "." || e.key === ",") {
-                          e.preventDefault();
-                        }
-                      }}
-                      step="1"
-                      defaultValue={10000}
-                      css={{
-                        "-moz-appearance": "textfield",
-                        "&::-webkit-outer-spin-button": {
-                          "-webkit-appearance": "none",
-                          margin: 0,
-                        },
-                        "&::-webkit-inner-spin-button ": {
-                          "-webkit-appearance": "none",
-                          margin: 0,
-                        },
-                      }}
                     />
-                    <Button
-                      size="xs"
-                      variant="primary"
-                      outline
-                      isLoading={estimateLoading}
-                      css={{
-                        position: "absolute",
-                        right: "$2",
-                        fontSize: "$xs",
-                        cursor: "pointer",
-                        alignContent: "center",
-                        display: "flex",
-                      }}
-                      onClick={async (e) => {
-                        e.preventDefault();
-                        setEstimateLoading(true);
-                        const formValues = getValues();
-                        try {
-                          const tx = await prepareDeployHookTx(
-                            account,
-                            formValues
-                          );
-                          if (tx) {
-                            const res = await estimateFee(tx, account);
-
-                            if (res && res.base_fee) {
-                              setValue(
-                                "Fee",
-                                Math.round(
-                                  Number(res.base_fee || "")
-                                ).toString()
-                              );
-                            }
-                          }
-                        } catch (err) {}
-
-                        setEstimateLoading(false);
-                      }}
-                    >
-                      Suggest
-                    </Button>
-                  </Box>
-                  {errors.Fee?.type === "required" && (
-                    <Box css={{ display: "inline", color: "$red11" }}>
-                      Fee is required
-                    </Box>
                   )}
+                />
+              </Box>
+              <Box css={{ width: "100%" }}>
+                <label>Hook Namespace Seed</label>
+                <Input
+                  {...register("HookNamespace", { required: true })}
+                  autoComplete={"off"}
+                  defaultValue={
+                    snap.files?.[snap.active]?.name?.split(".")?.[0] || ""
+                  }
+                />
+                {errors.HookNamespace?.type === "required" && (
+                  <Box css={{ display: "inline", color: "$red11" }}>
+                    Namespace is required
+                  </Box>
+                )}
+                <Box css={{ mt: "$3" }}>
+                  <label>Hook Namespace (sha256)</label>
+                  <Input readOnly value={hashedNamespace} />
                 </Box>
-                {/* <Box css={{ width: "100%" }}>
+              </Box>
+              <Box css={{ width: "100%" }}>
+                <label style={{ marginBottom: "10px", display: "block" }}>
+                  Hook parameters
+                </label>
+                <Stack>
+                  {fields.map((field, index) => (
+                    <Stack key={field.id}>
+                      <Input
+                        // important to include key with field's id
+                        placeholder="Parameter name"
+                        {...register(
+                          `HookParameters.${index}.HookParameter.HookParameterName`
+                        )}
+                      />
+                      <Input
+                        placeholder="Value (hex-quoted)"
+                        {...register(
+                          `HookParameters.${index}.HookParameter.HookParameterValue`
+                        )}
+                      />
+                      <Button onClick={() => remove(index)} variant="destroy">
+                        <Trash weight="regular" size="16px" />
+                      </Button>
+                    </Stack>
+                  ))}
+                  <Button
+                    outline
+                    fullWidth
+                    type="button"
+                    onClick={() =>
+                      append({
+                        HookParameter: {
+                          HookParameterName: "",
+                          HookParameterValue: "",
+                        },
+                      })
+                    }
+                  >
+                    <Plus size="16px" />
+                    Add Hook Parameter
+                  </Button>
+                </Stack>
+              </Box>
+              {/* <Box css={{ width: "100%" }}>
                 <label style={{ marginBottom: "10px", display: "block" }}>
                   Hook Grants
                 </label>
@@ -390,41 +260,38 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
                   </Button>
                 </Stack>
               </Box> */}
-              </Stack>
+            </Stack>
-            </DialogDescription>
+          </DialogDescription>
 
-            <Flex
+          <Flex
-              css={{
+            css={{
-                marginTop: 25,
+              marginTop: 25,
-                justifyContent: "flex-end",
+              justifyContent: "flex-end",
-                gap: "$3",
+              gap: "$3",
-              }}
+            }}
-            >
+          >
-              <DialogClose asChild>
-                <Button outline>Cancel</Button>
-              </DialogClose>
-              {/* <DialogClose asChild> */}
-              <Button
-                variant="primary"
-                type="submit"
-                isLoading={account.isLoading}
-              >
-                Set Hook
-              </Button>
-              {/* </DialogClose> */}
-            </Flex>
             <DialogClose asChild>
-              <Box css={{ position: "absolute", top: "$3", right: "$3" }}>
+              <Button outline>Cancel</Button>
-                <X size="20px" />
-              </Box>
             </DialogClose>
-          </form>
+            {/* <DialogClose asChild> */}
-        </DialogContent>
+            <Button
-      </Dialog>
+              variant="primary"
-    );
+              type="submit"
-  }
+              isLoading={account.isLoading}
-);
+            >
-
+              Set Hook
-SetHookDialog.displayName = "SetHookDialog";
+            </Button>
+            {/* </DialogClose> */}
+          </Flex>
+          <DialogClose asChild>
+            <Box css={{ position: "absolute", top: "$3", right: "$3" }}>
+              <X size="20px" />
+            </Box>
+          </DialogClose>
+        </form>
+      </DialogContent>
+    </Dialog>
+  );
+};
 
 export default SetHookDialog;

components/Switch.tsx

@@ -1,32 +0,0 @@
-import { styled } from "../stitches.config";
-import * as SwitchPrimitive from "@radix-ui/react-switch";
-
-const StyledSwitch = styled(SwitchPrimitive.Root, {
-  all: "unset",
-  width: 42,
-  height: 25,
-  backgroundColor: "$mauve9",
-  borderRadius: "9999px",
-  position: "relative",
-  boxShadow: `0 2px 10px $colors$mauve2`,
-  WebkitTapHighlightColor: "rgba(0, 0, 0, 0)",
-  "&:focus": { boxShadow: `0 0 0 2px $colors$mauveA2` },
-  '&[data-state="checked"]': { backgroundColor: "$green11" },
-});
-
-const StyledThumb = styled(SwitchPrimitive.Thumb, {
-  display: "block",
-  width: 21,
-  height: 21,
-  backgroundColor: "white",
-  borderRadius: "9999px",
-  boxShadow: `0 2px 2px $colors$mauveA6`,
-  transition: "transform 100ms",
-  transform: "translateX(2px)",
-  willChange: "transform",
-  '&[data-state="checked"]': { transform: "translateX(19px)" },
-});
-
-// Exports
-export const Switch = StyledSwitch;
-export const SwitchThumb = StyledThumb;

components/Tabs.tsx

@@ -6,7 +6,7 @@ import React, {
   useCallback,
 } from "react";
 import type { ReactNode, ReactElement } from "react";
-import { Box, Button, Flex, Input, Label, Stack, Text } from ".";
+import { Box, Button, Flex, Input, Stack, Text } from ".";
 import {
   Dialog,
   DialogTrigger,
@@ -29,7 +29,7 @@ interface TabProps {
   children: ReactNode;
 }
 
-// TODO customise messages shown
+// TODO customise strings shown
 interface Props {
   activeIndex?: number;
   activeHeader?: string;
@@ -40,7 +40,6 @@ interface Props {
   forceDefaultExtension?: boolean;
   onCreateNewTab?: (name: string) => any;
   onCloseTab?: (index: number, header?: string) => any;
-  onChangeActive?: (index: number, header?: string) => any;
 }
 
 export const Tab = (props: TabProps) => null;
@@ -53,12 +52,11 @@ export const Tabs = ({
   keepAllAlive = false,
   onCreateNewTab,
   onCloseTab,
-  onChangeActive,
   defaultExtension = "",
   forceDefaultExtension,
 }: Props) => {
   const [active, setActive] = useState(activeIndex || 0);
-  const tabs: TabProps[] = children.map(elem => elem.props);
+  const tabs: TabProps[] = children.map((elem) => elem.props);
 
   const [isNewtabDialogOpen, setIsNewtabDialogOpen] = useState(false);
   const [tabname, setTabname] = useState("");
@@ -70,9 +68,8 @@ export const Tabs = ({
 
   useEffect(() => {
     if (activeHeader) {
-      const idx = tabs.findIndex(tab => tab.header === activeHeader);
+      const idx = tabs.findIndex((tab) => tab.header === activeHeader);
-      if (idx !== -1) setActive(idx);
+      setActive(idx);
-      else setActive(0);
     }
   }, [activeHeader, tabs]);
 
@@ -83,7 +80,7 @@ export const Tabs = ({
 
   const validateTabname = useCallback(
     (tabname: string): { error: string | null } => {
-      if (tabs.find(tab => tab.header === tabname)) {
+      if (tabs.find((tab) => tab.header === tabname)) {
         return { error: "Name already exists." };
       }
       return { error: null };
@@ -91,14 +88,6 @@ export const Tabs = ({
     [tabs]
   );
 
-  const handleActiveChange = useCallback(
-    (idx: number, header?: string) => {
-      setActive(idx);
-      onChangeActive?.(idx, header);
-    },
-    [onChangeActive]
-  );
-
   const handleCreateTab = useCallback(() => {
     // add default extension in case omitted
     let _tabname = tabname.includes(".") ? tabname : tabname + defaultExtension;
@@ -114,20 +103,11 @@ export const Tabs = ({
 
     setIsNewtabDialogOpen(false);
     setTabname("");
+    // switch to new tab?
+    setActive(tabs.length);
 
     onCreateNewTab?.(_tabname);
-
+  }, [tabname, defaultExtension, validateTabname, onCreateNewTab, tabs.length]);
-    // switch to new tab?
-    handleActiveChange(tabs.length, _tabname);
-  }, [
-    tabname,
-    defaultExtension,
-    forceDefaultExtension,
-    validateTabname,
-    onCreateNewTab,
-    handleActiveChange,
-    tabs.length,
-  ]);
 
   const handleCloseTab = useCallback(
     (idx: number) => {
@@ -148,7 +128,7 @@ export const Tabs = ({
             gap: "$3",
             flex: 1,
             flexWrap: "nowrap",
-            marginBottom: "$2",
+            marginBottom: "-1px",
             width: "100%",
             overflow: "auto",
           }}
@@ -158,8 +138,8 @@ export const Tabs = ({
               key={tab.header}
               role="tab"
               tabIndex={idx}
-              onClick={() => handleActiveChange(idx, tab.header)}
+              onClick={() => setActive(idx)}
-              onKeyPress={() => handleActiveChange(idx, tab.header)}
+              onKeyPress={() => setActive(idx)}
               outline={active !== idx}
               size="sm"
               css={{
@@ -212,11 +192,11 @@ export const Tabs = ({
               <DialogContent>
                 <DialogTitle>Create new tab</DialogTitle>
                 <DialogDescription>
-                  <Label>Tabname</Label>
+                  <label>Tabname</label>
                   <Input
                     value={tabname}
-                    onChange={e => setTabname(e.target.value)}
+                    onChange={(e) => setTabname(e.target.value)}
-                    onKeyPress={e => {
+                    onKeyPress={(e) => {
                       if (e.key === "Enter") {
                         handleCreateTab();
                       }

components/Textarea.tsx

@@ -1,115 +0,0 @@
-import { styled } from "../stitches.config";
-
-export const Textarea = styled("textarea", {
-  // Reset
-  appearance: "none",
-  borderWidth: "0",
-  boxSizing: "border-box",
-  fontFamily: "inherit",
-  outline: "none",
-  width: "100%",
-  flex: "1",
-  backgroundColor: "$mauve4",
-  display: "inline-flex",
-  alignItems: "center",
-  justifyContent: "center",
-  borderRadius: "$sm",
-  p: "$2",
-  fontSize: "$md",
-  lineHeight: 1,
-  color: "$mauve12",
-  boxShadow: `0 0 0 1px $colors$mauve8`,
-  WebkitTapHighlightColor: "rgba(0,0,0,0)",
-  "&::before": {
-    boxSizing: "border-box",
-  },
-  "&::after": {
-    boxSizing: "border-box",
-  },
-  fontVariantNumeric: "tabular-nums",
-
-  "&:-webkit-autofill": {
-    boxShadow: "inset 0 0 0 1px $colors$blue6, inset 0 0 0 100px $colors$blue3",
-  },
-
-  "&:-webkit-autofill::first-line": {
-    fontFamily: "$untitled",
-    color: "$mauve12",
-  },
-
-  "&:focus": {
-    boxShadow: `0 0 0 1px $colors$mauve10`,
-    "&:-webkit-autofill": {
-      boxShadow: `0 0 0 1px $colors$mauve10`,
-    },
-  },
-  "&::placeholder": {
-    color: "$mauve9",
-  },
-  "&:disabled": {
-    pointerEvents: "none",
-    backgroundColor: "$mauve2",
-    color: "$mauve8",
-    cursor: "not-allowed",
-    "&::placeholder": {
-      color: "$mauve7",
-    },
-  },
-
-  variants: {
-    variant: {
-      ghost: {
-        boxShadow: "none",
-        backgroundColor: "transparent",
-        "@hover": {
-          "&:hover": {
-            boxShadow: "inset 0 0 0 1px $colors$mauve7",
-          },
-        },
-        "&:focus": {
-          backgroundColor: "$loContrast",
-          boxShadow: `0 0 0 1px $colors$mauve10`,
-        },
-        "&:disabled": {
-          backgroundColor: "transparent",
-        },
-        "&:read-only": {
-          backgroundColor: "transparent",
-        },
-      },
-      deep: {
-        backgroundColor: "$deep",
-        boxShadow: "none",
-      },
-    },
-    state: {
-      invalid: {
-        boxShadow: "inset 0 0 0 1px $colors$crimson7",
-        "&:focus": {
-          boxShadow:
-            "inset 0px 0px 0px 1px $colors$crimson8, 0px 0px 0px 1px $colors$crimson8",
-        },
-      },
-      valid: {
-        boxShadow: "inset 0 0 0 1px $colors$grass7",
-        "&:focus": {
-          boxShadow:
-            "inset 0px 0px 0px 1px $colors$grass8, 0px 0px 0px 1px $colors$grass8",
-        },
-      },
-    },
-    cursor: {
-      default: {
-        cursor: "default",
-        "&:focus": {
-          cursor: "text",
-        },
-      },
-      text: {
-        cursor: "text",
-      },
-    },
-  },
-});
-
-export default Textarea;

components/Tooltip.tsx

@@ -45,11 +45,11 @@ const StyledContent = styled(TooltipPrimitive.Content, {
   },
   ".dark &": {
     boxShadow:
-      "0px 0px 10px 2px rgba(0,0,0,.45), hsl(206 22% 7% / 35%) 0px 10px 38px -10px, hsl(206 22% 7% / 20%) 0px 10px 20px -15px",
+      "0px 0px 10px 2px rgba(255,255,255,.15), hsl(206 22% 7% / 35%) 0px 10px 38px -10px, hsl(206 22% 7% / 20%) 0px 10px 20px -15px",
   },
   ".light &": {
     boxShadow:
-      "0px 0px 10px 2px rgba(0,0,0,.25), hsl(206 22% 7% / 35%) 0px 10px 38px -10px, hsl(206 22% 7% / 20%) 0px 10px 20px -15px",
+      "0px 0px 10px 2px rgba(0,0,0,.15), hsl(206 22% 7% / 35%) 0px 10px 38px -10px, hsl(206 22% 7% / 20%) 0px 10px 20px -15px",
   },
 });
 
@@ -64,15 +64,12 @@ interface ITooltip {
   onOpenChange?: (open: boolean) => void;
 }
 
-const Tooltip: React.FC<
+const Tooltip: React.FC<ITooltip> = ({
-  React.ComponentProps<typeof StyledContent> & ITooltip
-> = ({
   children,
   content,
   open,
   defaultOpen = false,
   onOpenChange,
-  ...rest
 }) => {
   return (
     <TooltipPrimitive.Root
@@ -81,8 +78,8 @@ const Tooltip: React.FC<
       onOpenChange={onOpenChange}
     >
       <TooltipPrimitive.Trigger asChild>{children}</TooltipPrimitive.Trigger>
-      <StyledContent side="bottom" align="center" {...rest}>
+      <StyledContent side="bottom" align="center">
-        <div dangerouslySetInnerHTML={{ __html: content }} />
+        {content}
         <StyledArrow offset={5} width={11} height={5} />
       </StyledContent>
     </TooltipPrimitive.Root>

components/Transaction/index.tsx

@@ -1,228 +0,0 @@
-import { Play } from "phosphor-react";
-import { FC, useCallback, useEffect, useMemo } from "react";
-import { useSnapshot } from "valtio";
-import state from "../../state";
-import {
-  modifyTransaction,
-  prepareState,
-  prepareTransaction,
-  TransactionState,
-} from "../../state/transactions";
-import { sendTransaction } from "../../state/actions";
-import Box from "../Box";
-import Button from "../Button";
-import Flex from "../Flex";
-import { TxJson } from "./json";
-import { TxUI } from "./ui";
-import { default as _estimateFee } from "../../utils/estimateFee";
-import toast from 'react-hot-toast';
-
-export interface TransactionProps {
-  header: string;
-  state: TransactionState;
-}
-
-const Transaction: FC<TransactionProps> = ({
-  header,
-  state: txState,
-  ...props
-}) => {
-  const { accounts, editorSettings } = useSnapshot(state);
-  const {
-    selectedAccount,
-    selectedTransaction,
-    txIsDisabled,
-    txIsLoading,
-    viewType,
-    editorSavedValue,
-    editorValue,
-  } = txState;
-
-  const setState = useCallback(
-    (pTx?: Partial<TransactionState>) => {
-      return modifyTransaction(header, pTx);
-    },
-    [header]
-  );
-
-  const prepareOptions = useCallback(
-    (state: TransactionState = txState) => {
-      const {
-        selectedTransaction,
-        selectedDestAccount,
-        selectedAccount,
-        txFields,
-      } = state;
-
-      const TransactionType = selectedTransaction?.value || null;
-      const Destination =
-        selectedDestAccount?.value ||
-        ("Destination" in txFields ? null : undefined);
-      const Account = selectedAccount?.value || null;
-
-      return prepareTransaction({
-        ...txFields,
-        TransactionType,
-        Destination,
-        Account,
-      });
-    },
-    [txState]
-  );
-
-  useEffect(() => {
-    const transactionType = selectedTransaction?.value;
-    const account = selectedAccount?.value;
-    if (!account || !transactionType || txIsLoading) {
-      setState({ txIsDisabled: true });
-    } else {
-      setState({ txIsDisabled: false });
-    }
-  }, [
-    selectedAccount?.value,
-    selectedTransaction?.value,
-    setState,
-    txIsLoading,
-  ]);
-
-  const submitTest = useCallback(async () => {
-    let st: TransactionState | undefined;
-    const tt = txState.selectedTransaction?.value;
-    if (viewType === "json") {
-      // save the editor state first
-      const pst = prepareState(editorValue || "", tt);
-      if (!pst) return;
-
-      st = setState(pst);
-    }
-
-    const account = accounts.find(
-      acc => acc.address === selectedAccount?.value
-    );
-    if (txIsDisabled) return;
-
-    setState({ txIsLoading: true });
-    const logPrefix = header ? `${header.split(".")[0]}: ` : undefined;
-    try {
-      if (!account) {
-        throw Error("Account must be selected from imported accounts!");
-      }
-      const options = prepareOptions(st);
-
-      if (options.Destination === null) {
-        throw Error("Destination account cannot be null");
-      }
-
-      await sendTransaction(account, options, { logPrefix });
-    } catch (error) {
-      console.error(error);
-      if (error instanceof Error) {
-        state.transactionLogs.push({
-          type: "error",
-          message: `${logPrefix}${error.message}`,
-        });
-      }
-    }
-    setState({ txIsLoading: false });
-  }, [
-    viewType,
-    accounts,
-    txIsDisabled,
-    setState,
-    header,
-    editorValue,
-    txState,
-    selectedAccount?.value,
-    prepareOptions,
-  ]);
-
-  const resetState = useCallback(() => {
-    modifyTransaction(header, { viewType }, { replaceState: true });
-  }, [header, viewType]);
-
-  const jsonValue = useMemo(
-    () =>
-      editorSavedValue ||
-      JSON.stringify(prepareOptions?.() || {}, null, editorSettings.tabSize),
-    [editorSavedValue, editorSettings.tabSize, prepareOptions]
-  );
-
-  const estimateFee = useCallback(
-    async (st?: TransactionState, opts?: { silent?: boolean }) => {
-      const state = st || txState;
-      const ptx = prepareOptions(state);
-      const account = accounts.find(
-        acc => acc.address === state.selectedAccount?.value
-      );
-      if (!account) {
-        if (!opts?.silent) {
-          toast.error("Please select account from the list.")
-        }
-        return
-      };
-
-      ptx.Account = account.address;
-      ptx.Sequence = account.sequence;
-
-      const res = await _estimateFee(ptx, account, opts);
-      const fee = res?.base_fee;
-      setState({ estimatedFee: fee });
-      return fee;
-    },
-    [accounts, prepareOptions, setState, txState]
-  );
-
-  return (
-    <Box css={{ position: "relative", height: "calc(100% - 28px)" }} {...props}>
-      {viewType === "json" ? (
-        <TxJson
-          value={jsonValue}
-          header={header}
-          state={txState}
-          setState={setState}
-          estimateFee={estimateFee}
-        />
-      ) : (
-        <TxUI state={txState} setState={setState} estimateFee={estimateFee} />
-      )}
-      <Flex
-        row
-        css={{
-          justifyContent: "space-between",
-          position: "absolute",
-          left: 0,
-          bottom: 0,
-          width: "100%",
-          mb: "$1",
-        }}
-      >
-        <Button
-          onClick={() => {
-            if (viewType === "ui") {
-              setState({ editorSavedValue: null, viewType: "json" });
-            } else setState({ viewType: "ui" });
-          }}
-          outline
-        >
-          {viewType === "ui" ? "EDIT AS JSON" : "EXIT JSON MODE"}
-        </Button>
-        <Flex row>
-          <Button onClick={resetState} outline css={{ mr: "$3" }}>
-            RESET
-          </Button>
-          <Button
-            variant="primary"
-            onClick={submitTest}
-            isLoading={txIsLoading}
-            disabled={txIsDisabled}
-          >
-            <Play weight="bold" size="16px" />
-            RUN TEST
-          </Button>
-        </Flex>
-      </Flex>
-    </Box>
-  );
-};
-
-export default Transaction;

components/Transaction/json.tsx

@@ -1,231 +0,0 @@
-import Editor, { loader, useMonaco } from "@monaco-editor/react";
-import { FC, useCallback, useEffect, useState } from "react";
-import { useTheme } from "next-themes";
-
-import dark from "../../theme/editor/amy.json";
-import light from "../../theme/editor/xcode_default.json";
-import { useSnapshot } from "valtio";
-import state, {
-  prepareState,
-  transactionsData,
-  TransactionState,
-} from "../../state";
-import Text from "../Text";
-import Flex from "../Flex";
-import { Link } from "..";
-import { showAlert } from "../../state/actions/showAlert";
-import { parseJSON } from "../../utils/json";
-import { extractSchemaProps } from "../../utils/schema";
-import amountSchema from "../../content/amount-schema.json";
-
-loader.config({
-  paths: {
-    vs: "https://cdn.jsdelivr.net/npm/monaco-editor@0.30.1/min/vs",
-  },
-});
-
-interface JsonProps {
-  value?: string;
-  header?: string;
-  setState: (pTx?: Partial<TransactionState> | undefined) => void;
-  state: TransactionState;
-  estimateFee?: () => Promise<string | undefined>;
-}
-
-export const TxJson: FC<JsonProps> = ({
-  value = "",
-  state: txState,
-  header,
-  setState,
-}) => {
-  const { editorSettings, accounts } = useSnapshot(state);
-  const { editorValue = value, estimatedFee } = txState;
-  const { theme } = useTheme();
-  const [hasUnsaved, setHasUnsaved] = useState(false);
-  const [currTxType, setCurrTxType] = useState<string | undefined>(
-    txState.selectedTransaction?.value
-  );
-
-  useEffect(() => {
-    setState({ editorValue: value });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [value]);
-
-  useEffect(() => {
-    const parsed = parseJSON(editorValue);
-    if (!parsed) return;
-
-    const tt = parsed.TransactionType;
-    const tx = transactionsData.find(t => t.TransactionType === tt);
-    if (tx) setCurrTxType(tx.TransactionType);
-    else {
-      setCurrTxType(undefined);
-    }
-  }, [editorValue]);
-
-  useEffect(() => {
-    if (editorValue === value) setHasUnsaved(false);
-    else setHasUnsaved(true);
-  }, [editorValue, value]);
-
-  const saveState = (value: string, transactionType?: string) => {
-    const tx = prepareState(value, transactionType);
-    if (tx) setState(tx);
-  };
-
-  const discardChanges = () => {
-    showAlert("Confirm", {
-      body: "Are you sure to discard these changes?",
-      confirmText: "Yes",
-      onConfirm: () => setState({ editorValue: value }),
-    });
-  };
-
-  const onExit = (value: string) => {
-    const options = parseJSON(value);
-    if (options) {
-      saveState(value, currTxType);
-      return;
-    }
-    showAlert("Error!", {
-      body: `Malformed Transaction in ${header}, would you like to discard these changes?`,
-      confirmText: "Discard",
-      onConfirm: () => setState({ editorValue: value }),
-      onCancel: () => setState({ viewType: "json", editorSavedValue: value }),
-    });
-  };
-
-  const path = `file:///${header}`;
-  const monaco = useMonaco();
-
-  const getSchemas = useCallback(async (): Promise<any[]> => {
-    const txObj = transactionsData.find(
-      td => td.TransactionType === currTxType
-    );
-
-    let genericSchemaProps: any;
-    if (txObj) {
-      genericSchemaProps = extractSchemaProps(txObj);
-    } else {
-      genericSchemaProps = transactionsData.reduce(
-        (cumm, td) => ({
-          ...cumm,
-          ...extractSchemaProps(td),
-        }),
-        {}
-      );
-    }
-    return [
-      {
-        uri: "file:///main-schema.json", // id of the first schema
-        fileMatch: ["**.json"], // associate with our model
-        schema: {
-          title: header,
-          type: "object",
-          required: ["TransactionType", "Account"],
-          properties: {
-            ...genericSchemaProps,
-            TransactionType: {
-              title: "Transaction Type",
-              enum: transactionsData.map(td => td.TransactionType),
-            },
-            Account: {
-              $ref: "file:///account-schema.json",
-            },
-            Destination: {
-              anyOf: [
-                {
-                  $ref: "file:///account-schema.json",
-                },
-                {
-                  type: "string",
-                  title: "Destination Account",
-                },
-              ],
-            },
-            Amount: {
-              $ref: "file:///amount-schema.json",
-            },
-            Fee: {
-              $ref: "file:///fee-schema.json",
-            },
-          },
-        },
-      },
-      {
-        uri: "file:///account-schema.json",
-        schema: {
-          type: "string",
-          title: "Account type",
-          enum: accounts.map(acc => acc.address),
-        },
-      },
-      {
-        uri: "file:///fee-schema.json",
-        schema: {
-          type: "string",
-          title: "Fee type",
-          const: estimatedFee,
-          description: estimatedFee
-            ? "Above mentioned value is recommended base fee"
-            : undefined,
-        },
-      },
-      {
-        ...amountSchema,
-      },
-    ];
-  }, [accounts, currTxType, estimatedFee, header]);
-
-  useEffect(() => {
-    if (!monaco) return;
-    getSchemas().then(schemas => {
-      monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
-        validate: true,
-        schemas,
-      });
-    });
-  }, [getSchemas, monaco]);
-
-  return (
-    <Flex
-      fluid
-      column
-      css={{ height: "calc(100% - 45px)", position: "relative" }}
-    >
-      <Editor
-        className="hooks-editor"
-        language={"json"}
-        path={path}
-        height="100%"
-        beforeMount={monaco => {
-          monaco.editor.defineTheme("dark", dark as any);
-          monaco.editor.defineTheme("light", light as any);
-        }}
-        value={editorValue}
-        onChange={val => setState({ editorValue: val })}
-        onMount={(editor, monaco) => {
-          editor.updateOptions({
-            minimap: { enabled: false },
-            glyphMargin: true,
-            tabSize: editorSettings.tabSize,
-            dragAndDrop: true,
-            fontSize: 14,
-          });
-
-          // register onExit cb
-          const model = editor.getModel();
-          model?.onWillDispose(() => onExit(model.getValue()));
-        }}
-        theme={theme === "dark" ? "dark" : "light"}
-      />
-      {hasUnsaved && (
-        <Text muted small css={{ position: "absolute", bottom: 0, right: 0 }}>
-          This file has unsaved changes.{" "}
-          <Link onClick={() => saveState(editorValue, currTxType)}>save</Link>{" "}
-          <Link onClick={discardChanges}>discard</Link>
-        </Text>
-      )}
-    </Flex>
-  );
-};

components/Transaction/ui.tsx

@@ -1,320 +0,0 @@
-import { FC, useCallback, useEffect, useState } from "react";
-import Container from "../Container";
-import Flex from "../Flex";
-import Input from "../Input";
-import Select from "../Select";
-import Text from "../Text";
-import {
-  SelectOption,
-  TransactionState,
-  transactionsData,
-  TxFields,
-  getTxFields,
-} from "../../state/transactions";
-import { useSnapshot } from "valtio";
-import state from "../../state";
-import { streamState } from "../DebugStream";
-import { Button } from "..";
-import Textarea from "../Textarea";
-
-interface UIProps {
-  setState: (
-    pTx?: Partial<TransactionState> | undefined
-  ) => TransactionState | undefined;
-  state: TransactionState;
-  estimateFee?: (...arg: any) => Promise<string | undefined>;
-}
-
-export const TxUI: FC<UIProps> = ({
-  state: txState,
-  setState,
-  estimateFee,
-}) => {
-  const { accounts } = useSnapshot(state);
-  const {
-    selectedAccount,
-    selectedDestAccount,
-    selectedTransaction,
-    txFields,
-  } = txState;
-
-  const transactionsOptions = transactionsData.map((tx) => ({
-    value: tx.TransactionType,
-    label: tx.TransactionType,
-  }));
-
-  const accountOptions: SelectOption[] = accounts.map((acc) => ({
-    label: acc.name,
-    value: acc.address,
-  }));
-
-  const destAccountOptions: SelectOption[] = accounts
-    .map((acc) => ({
-      label: acc.name,
-      value: acc.address,
-    }))
-    .filter((acc) => acc.value !== selectedAccount?.value);
-
-  const [feeLoading, setFeeLoading] = useState(false);
-
-  const resetOptions = useCallback(
-    (tt: string) => {
-      const fields = getTxFields(tt);
-      if (!fields.Destination) setState({ selectedDestAccount: null });
-      return setState({ txFields: fields });
-    },
-    [setState]
-  );
-
-  const handleSetAccount = (acc: SelectOption) => {
-    setState({ selectedAccount: acc });
-    streamState.selectedAccount = acc;
-  };
-
-  const handleSetField = useCallback(
-    (field: keyof TxFields, value: string, opFields?: TxFields) => {
-      const fields = opFields || txFields;
-      const obj = fields[field];
-      setState({
-        txFields: {
-          ...fields,
-          [field]: typeof obj === "object" ? { ...obj, $value: value } : value,
-        },
-      });
-    },
-    [setState, txFields]
-  );
-
-  const handleEstimateFee = useCallback(
-    async (state?: TransactionState, silent?: boolean) => {
-      setFeeLoading(true);
-
-      const fee = await estimateFee?.(state, { silent });
-      if (fee) handleSetField("Fee", fee, state?.txFields);
-
-      setFeeLoading(false);
-    },
-    [estimateFee, handleSetField]
-  );
-
-  const handleChangeTxType = (tt: SelectOption) => {
-    setState({ selectedTransaction: tt });
-
-    const newState = resetOptions(tt.value);
-
-    handleEstimateFee(newState, true);
-  };
-
-  const specialFields = ["TransactionType", "Account", "Destination"];
-
-  const otherFields = Object.keys(txFields).filter(
-    (k) => !specialFields.includes(k)
-  ) as [keyof TxFields];
-
-  const switchToJson = () =>
-    setState({ editorSavedValue: null, viewType: "json" });
-
-  useEffect(() => {
-    const defaultOption = transactionsOptions.find(
-      (tt) => tt.value === "Payment"
-    );
-    if (defaultOption) {
-      handleChangeTxType(defaultOption);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  return (
-    <Container
-      css={{
-        p: "$3 01",
-        fontSize: "$sm",
-        height: "calc(100% - 45px)",
-      }}
-    >
-      <Flex column fluid css={{ height: "100%", overflowY: "auto", pr: "$1" }}>
-        <Flex
-          row
-          fluid
-          css={{
-            justifyContent: "flex-end",
-            alignItems: "center",
-            mb: "$3",
-            mt: "1px",
-            pr: "1px",
-          }}
-        >
-          <Text muted css={{ mr: "$3" }}>
-            Transaction type:{" "}
-          </Text>
-          <Select
-            instanceId="transactionsType"
-            placeholder="Select transaction type"
-            options={transactionsOptions}
-            hideSelectedOptions
-            css={{ width: "70%" }}
-            value={selectedTransaction}
-            onChange={(tt: any) => handleChangeTxType(tt)}
-          />
-        </Flex>
-        <Flex
-          row
-          fluid
-          css={{
-            justifyContent: "flex-end",
-            alignItems: "center",
-            mb: "$3",
-            pr: "1px",
-          }}
-        >
-          <Text muted css={{ mr: "$3" }}>
-            Account:{" "}
-          </Text>
-          <Select
-            instanceId="from-account"
-            placeholder="Select your account"
-            css={{ width: "70%" }}
-            options={accountOptions}
-            value={selectedAccount}
-            onChange={(acc: any) => handleSetAccount(acc)} // TODO make react-select have correct types for acc
-          />
-        </Flex>
-        {txFields.Destination !== undefined && (
-          <Flex
-            row
-            fluid
-            css={{
-              justifyContent: "flex-end",
-              alignItems: "center",
-              mb: "$3",
-              pr: "1px",
-            }}
-          >
-            <Text muted css={{ mr: "$3" }}>
-              Destination account:{" "}
-            </Text>
-            <Select
-              instanceId="to-account"
-              placeholder="Select the destination account"
-              css={{ width: "70%" }}
-              options={destAccountOptions}
-              value={selectedDestAccount}
-              isClearable
-              onChange={(acc: any) => setState({ selectedDestAccount: acc })}
-            />
-          </Flex>
-        )}
-        {otherFields.map((field) => {
-          let _value = txFields[field];
-
-          let value: string | undefined;
-          if (typeof _value === "object") {
-            if (_value.$type === "json" && typeof _value.$value === "object") {
-              value = JSON.stringify(_value.$value, null, 2);
-            } else {
-              value = _value.$value.toString();
-            }
-          } else {
-            value = _value?.toString();
-          }
-
-          const isXrp = typeof _value === "object" && _value.$type === "xrp";
-          const isJson = typeof _value === "object" && _value.$type === "json";
-          const isFee = field === "Fee";
-          let rows = isJson
-            ? (value?.match(/\n/gm)?.length || 0) + 1
-            : undefined;
-          if (rows && rows > 5) rows = 5;
-          return (
-            <Flex column key={field} css={{ mb: "$2", pr: "1px" }}>
-              <Flex
-                row
-                fluid
-                css={{
-                  justifyContent: "flex-end",
-                  alignItems: "center",
-                  position: "relative",
-                }}
-              >
-                <Text muted css={{ mr: "$3" }}>
-                  {field + (isXrp ? " (XRP)" : "")}:{" "}
-                </Text>
-                {isJson ? (
-                  <Textarea
-                    rows={rows}
-                    value={value}
-                    spellCheck={false}
-                    onChange={switchToJson}
-                    css={{
-                      width: "70%",
-                      flex: "inherit",
-                      resize: "vertical",
-                    }}
-                  />
-                ) : (
-                  <Input
-                    type={isFee ? "number" : "text"}
-                    value={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,
-                      },
-                    }}
-                  />
-                )}
-                {isFee && (
-                  <Button
-                    size="xs"
-                    variant="primary"
-                    outline
-                    disabled={txState.txIsDisabled}
-                    isDisabled={txState.txIsDisabled}
-                    isLoading={feeLoading}
-                    css={{
-                      position: "absolute",
-                      right: "$2",
-                      fontSize: "$xs",
-                      cursor: "pointer",
-                      alignContent: "center",
-                      display: "flex",
-                    }}
-                    onClick={() => handleEstimateFee()}
-                  >
-                    Suggest
-                  </Button>
-                )}
-              </Flex>
-            </Flex>
-          );
-        })}
-      </Flex>
-    </Container>
-  );
-};

components/icons/Carbon.tsx

@@ -1,40 +0,0 @@
-const Carbon = () => (
-  <svg
-    width="66"
-    height="32"
-    viewBox="0 0 66 32"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M33 2L23 15H28L21 24H45L38 15H43L33 2Z"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      d="M33 24V30"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      className="angle"
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M-1.14441e-05 4L8.94099 15.0625L4.00543e-05 26.125H2.27587L10.5015 15.9475H16.5938V14.1775H10.5015L2.27582 4H-1.14441e-05Z"
-      fill="#EDEDEF"
-    />
-    <path
-      className="angle"
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M66 4L57.059 15.0625L66 26.125H63.7241L55.4985 15.9475H49.4062V14.1775H55.4985L63.7242 4H66Z"
-      fill="#EDEDEF"
-    />
-  </svg>
-);
-
-export default Carbon;

components/icons/Firewall.tsx

@@ -1,75 +0,0 @@
-const Firewall = () => (
-  <svg
-    width="66"
-    height="32"
-    viewBox="0 0 66 32"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M33 13V7"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      d="M27 19V13"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      d="M39 19V13"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      d="M33 25V19"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      d="M21 13H45"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      d="M21 19H45"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      d="M45 7H21V25H45V7Z"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      className="angle"
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M-1.14441e-05 4.875L8.94099 15.9375L4.00543e-05 27H2.27587L10.5015 16.8225H16.5938V15.0525H10.5015L2.27582 4.875H-1.14441e-05Z"
-      fill="#EDEDEF"
-    />
-    <path
-      className="angle"
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M66 4.875L57.059 15.9375L66 27H63.7241L55.4985 16.8225H49.4062V15.0525H55.4985L63.7242 4.875H66Z"
-      fill="#EDEDEF"
-    />
-  </svg>
-);
-
-export default Firewall;

components/icons/Notary.tsx

@@ -1,40 +0,0 @@
-const Notary = () => (
-  <svg
-    width="66"
-    height="32"
-    viewBox="0 0 66 32"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M37.5 10.5L26.5 21.5L21 16.0002"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      d="M49 10.5L38 21.5L35.0784 18.5785"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      className="angle"
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M-1.14441e-05 5L8.94099 16.0625L4.00543e-05 27.125H2.27587L10.5015 16.9475H16.5938V15.1775H10.5015L2.27582 5H-1.14441e-05Z"
-      fill="#EDEDEF"
-    />
-    <path
-      className="angle"
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M66 5L57.059 16.0625L66 27.125H63.7241L55.4985 16.9475H49.4062V15.1775H55.4985L63.7242 5H66Z"
-      fill="#EDEDEF"
-    />
-  </svg>
-);
-
-export default Notary;

components/icons/Peggy.tsx

@@ -1,61 +0,0 @@
-const Peggy = () => (
-  <svg
-    width="66"
-    height="32"
-    viewBox="0 0 66 32"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M33 19C40.1797 19 46 16.3137 46 13C46 9.68629 40.1797 7 33 7C25.8203 7 20 9.68629 20 13C20 16.3137 25.8203 19 33 19Z"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      d="M33 19V25"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      d="M20 13V19C20 22 25 25 33 25C41 25 46 22 46 19V13"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      d="M41 17.7633V23.7634"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      d="M25 17.7633V23.7634"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      className="angle"
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M-1.14441e-05 4L8.94099 15.0625L4.00543e-05 26.125H2.27587L10.5015 15.9475H16.5938V14.1775H10.5015L2.27582 4H-1.14441e-05Z"
-      fill="#EDEDEF"
-    />
-    <path
-      className="angle"
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M66 4L57.059 15.0625L66 26.125H63.7241L55.4985 15.9475H49.4062V14.1775H55.4985L63.7242 4H66Z"
-      fill="#EDEDEF"
-    />
-  </svg>
-);
-
-export default Peggy;

components/icons/Starter.tsx

@@ -1,40 +0,0 @@
-const Starter = () => (
-  <svg
-    width="66"
-    height="32"
-    viewBox="0 0 66 32"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M42 28H24C23.7347 28 23.4804 27.8946 23.2929 27.7071C23.1053 27.5196 23 27.2652 23 27V5C23 4.73479 23.1053 4.48044 23.2929 4.2929C23.4804 4.10537 23.7347 4.00001 24 4H36.0003L43 11V27C43 27.2652 42.8947 27.5196 42.7071 27.7071C42.5196 27.8946 42.2653 28 42 28V28Z"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      d="M36 4V11H43.001"
-      stroke="#EDEDEF"
-      strokeWidth="1.5"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path
-      className="angle"
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M-1.14441e-05 4.875L8.94099 15.9375L4.00543e-05 27H2.27587L10.5015 16.8225H16.5938V15.0525H10.5015L2.27582 4.875H-1.14441e-05Z"
-      fill="#EDEDEF"
-    />
-    <path
-      className="angle"
-      fillRule="evenodd"
-      clipRule="evenodd"
-      d="M66 4.875L57.059 15.9375L66 27H63.7241L55.4985 16.8225H49.4062V15.0525H55.4985L63.7242 4.875H66Z"
-      fill="#EDEDEF"
-    />
-  </svg>
-);
-
-export default Starter;

components/index.tsx

@@ -4,13 +4,14 @@ export { default as Container } from "./Container";
 export { default as Heading } from "./Heading";
 export { default as Stack } from "./Stack";
 export { default as Text } from "./Text";
-export { default as Input, Label } from "./Input";
+export { default as Input } from "./Input";
 export { default as Select } from "./Select";
 export * from "./Tabs";
-export * from "./AlertDialog/primitive";
+export * from "./AlertDialog";
 export { default as Box } from "./Box";
 export { default as Button } from "./Button";
 export { default as Pre } from "./Pre";
 export { default as ButtonGroup } from "./ButtonGroup";
+export { default as DeployFooter } from "./DeployFooter";
 export * from "./Dialog";
 export * from "./DropdownMenu";

content/amount-schema.json

@@ -1,50 +0,0 @@
-{
-  "uri": "file:///amount-schema.json",
-  "title": "Amount",
-  "description": "Specify xrp in drops and tokens as objects.",
-  "schema": {
-    "anyOf": [
-      {
-        "type": [
-          "number",
-          "string"
-        ],
-        "exclusiveMinimum": 0,
-        "maximum": "100000000000000000"
-      },
-      {
-        "type": "object",
-        "properties": {
-          "currency": {
-            "description": "Arbitrary currency code for the token. Cannot be XRP."
-          },
-          "value": {
-            "type": [
-              "string",
-              "number"
-            ],
-            "description": "Quoted decimal representation of the amount of the token."
-          },
-          "issuer": {
-            "type": "string",
-            "description": "Generally, the account that issues this token. In special cases, this can refer to the account that holds the token instead."
-          }
-        }
-      }
-    ],
-    "defaultSnippets": [
-      {
-        "label": "Xrp",
-        "body": "1000000"
-      },
-      {
-        "label": "Token",
-        "body": {
-          "currency": "${1:13.1}",
-          "value": "${2:FOO}",
-          "description": "${3:rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpns}"
-        }
-      }
-    ]
-  }
-}

content/transactions.json

@@ -27,8 +27,8 @@
     "Account": "rfkE1aSy9G8Upk4JssnwBxhEv5p4mn2KTy",
     "TransactionType": "CheckCash",
     "Amount": {
-      "$value": "100",
+      "value": "100",
-      "$type": "xrp"
+      "type": "currency"
     },
     "CheckID": "838766BA2B995C00744175F69A1B11E32C3DBC40E64801A4056FCBD657F57334",
     "Fee": "12"
@@ -61,8 +61,8 @@
     "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
     "TransactionType": "EscrowCreate",
     "Amount": {
-      "$value": "100",
+      "value": "100",
-      "$type": "xrp"
+      "type": "currency"
     },
     "Destination": "rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW",
     "CancelAfter": 533257958,
@@ -99,8 +99,8 @@
     "Account": "rs8jBmmfpwgmrSPgwMsh7CvKRmRt1JTVSX",
     "TokenID": "000100001E962F495F07A990F4ED55ACCFEEF365DBAA76B6A048C0A200000007",
     "Amount": {
-      "$value": "100",
+      "value": "100",
-      "$type": "xrp"
+      "type": "currency"
     },
     "Flags": 1
   },
@@ -122,8 +122,8 @@
     "Sequence": 8,
     "TakerGets": "6000000",
     "Amount": {
-      "$value": "100",
+      "value": "100",
-      "$type": "xrp"
+      "type": "currency"
     }
   },
   {
@@ -131,8 +131,8 @@
     "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
     "Destination": "ra5nK24KXen9AHvsdFTKHSANinZseWnPcX",
     "Amount": {
-      "$value": "100",
+      "value": "100",
-      "$type": "xrp"
+      "type": "currency"
     },
     "Fee": "12",
     "Flags": 2147483648,
@@ -142,8 +142,8 @@
     "Account": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn",
     "TransactionType": "PaymentChannelCreate",
     "Amount": {
-      "$value": "100",
+      "value": "100",
-      "$type": "xrp"
+      "type": "currency"
     },
     "Destination": "rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW",
     "SettleDelay": 86400,
@@ -157,8 +157,8 @@
     "TransactionType": "PaymentChannelFund",
     "Channel": "C1AE6DDDEEC05CF2978C0BAD6FE302948E9533691DC749DCDD3B9E5992CA6198",
     "Amount": {
-      "$value": "200",
+      "value": "200",
-      "$type": "xrp"
+      "type": "currency"
     },
     "Expiration": 543171558
   },
@@ -176,8 +176,8 @@
     "Fee": "12",
     "SignerQuorum": 3,
     "SignerEntries": {
-      "$type": "json",
+      "type": "json",
-      "$value": [
+      "value": [
         {
           "SignerEntry": {
             "Account": "rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW",
@@ -213,8 +213,8 @@
     "Flags": 262144,
     "LastLedgerSequence": 8007750,
     "Amount": {
-      "$value": "100",
+      "value": "100",
-      "$type": "xrp"
+      "type": "currency"
     },
     "Sequence": 12
   }

next.config.js

@@ -8,9 +8,6 @@ module.exports = {
     config.resolve.alias["vscode"] = require.resolve(
       "@codingame/monaco-languageclient/lib/vscode-compatibility"
     );
-    config.resolve.alias["handlebars"] = require.resolve(
-      "handlebars/dist/handlebars.js"
-    );
     if (!isServer) {
       config.resolve.fallback.fs = false;
     }

package.json

@@ -12,23 +12,19 @@
   "dependencies": {
     "@codingame/monaco-jsonrpc": "^0.3.1",
     "@codingame/monaco-languageclient": "^0.17.0",
-    "@monaco-editor/react": "^4.4.5",
+    "@monaco-editor/react": "^4.4.1",
     "@octokit/core": "^3.5.1",
     "@radix-ui/colors": "^0.1.7",
     "@radix-ui/react-alert-dialog": "^0.1.1",
     "@radix-ui/react-dialog": "^0.1.1",
     "@radix-ui/react-dropdown-menu": "^0.1.1",
     "@radix-ui/react-id": "^0.1.1",
-    "@radix-ui/react-label": "^0.1.5",
-    "@radix-ui/react-popover": "^0.1.6",
-    "@radix-ui/react-switch": "^0.1.5",
     "@radix-ui/react-tooltip": "^0.1.7",
-    "@stitches/react": "^1.2.8",
+    "@stitches/react": "^1.2.6-0",
     "base64-js": "^1.5.1",
     "dinero.js": "^1.9.1",
     "file-saver": "^2.0.5",
     "filesize": "^8.0.7",
-    "handlebars": "^4.7.7",
     "javascript-time-ago": "^2.3.11",
     "jszip": "^3.7.1",
     "lodash.uniqby": "^4.7.0",

pages/_app.tsx

@@ -16,7 +16,6 @@ import state from "../state";
 import TimeAgo from "javascript-time-ago";
 import en from "javascript-time-ago/locale/en.json";
 import { useSnapshot } from "valtio";
-import Alert from "../components/AlertDialog";
 
 TimeAgo.setDefaultLocale(en.locale);
 TimeAgo.addLocale(en);
@@ -61,22 +60,22 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: AppProps) {
         <meta name="format-detection" content="telephone=no" />
         <meta property="og:url" content={`${origin}${router.asPath}`} />
 
-        <title>XRPL Hooks Builder</title>
+        <title>XRPL Hooks Editor</title>
-        <meta property="og:title" content="XRPL Hooks Builder" />
+        <meta property="og:title" content="XRPL Hooks Editor" />
-        <meta name="twitter:title" content="XRPL Hooks Builder" />
+        <meta name="twitter:title" content="XRPL Hooks Editor" />
         <meta name="twitter:card" content="summary_large_image" />
-        <meta name="twitter:site" content="@XRPLF" />
+        <meta name="twitter:site" content="@xrpllabs" />
         <meta
           name="description"
-          content="Hooks Builder, add smart contract functionality to the XRP Ledger."
+          content="Playground for buildings Hooks, that add smart contract functionality to the XRP Ledger."
         />
         <meta
           property="og:description"
-          content="Hooks Builder, add smart contract functionality to the XRP Ledger."
+          content="Playground for buildings Hooks, that add smart contract functionality to the XRP Ledger."
         />
         <meta
           name="twitter:description"
-          content="Hooks Builder, add smart contract functionality to the XRP Ledger."
+          content="Playground for buildings Hooks, that add smart contract functionality to the XRP Ledger.."
         />
         <meta property="og:image" content={`${origin}${shareImg}`} />
         <meta property="og:image:width" content="1200" />
@@ -101,7 +100,7 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: AppProps) {
         />
         <link rel="manifest" href="/site.webmanifest" />
         <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#161618" />
-        <meta name="application-name" content="XRPL Hooks Builder" />
+        <meta name="application-name" content="XRPL Hooks Editor" />
         <meta name="msapplication-TileColor" content="#c10ad0" />
         <meta
           name="theme-color"
@@ -141,7 +140,6 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: AppProps) {
                 })(),
               }}
             />
-            <Alert />
           </ThemeProvider>
         </SessionProvider>
       </IdProvider>

pages/api/proxy.ts

@@ -1,18 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from 'next'
-
-export default async function handler(
-    req: NextApiRequest,
-    res: NextApiResponse
-) {
-    try {
-        const { url, opts } = req.body
-        const r = await fetch(url, opts);
-        if (!r.ok) throw (r.statusText)
-
-        const data = await r.json()
-        return res.json(data)
-    } catch (error) {
-        console.warn(error)
-        return res.status(500).json({ message: "Something went wrong!" })
-    }
-}

pages/develop/[[...slug]].tsx

@@ -1,20 +1,15 @@
-import { Label } from "@radix-ui/react-label";
 import type { NextPage } from "next";
 import dynamic from "next/dynamic";
-import { Gear, Play } from "phosphor-react";
+import { Play } from "phosphor-react";
 import Hotkeys from "react-hot-keys";
 import Split from "react-split";
 import { useSnapshot } from "valtio";
-import { ButtonGroup, Flex } from "../../components";
 import Box from "../../components/Box";
 import Button from "../../components/Button";
-import LogBoxForScripts from "../../components/LogBoxForScripts";
-import Popover from "../../components/Popover";
-import RunScript from "../../components/RunScript";
 import state from "../../state";
 import { compileCode } from "../../state/actions";
 import { getSplit, saveSplit } from "../../state/actions/persistSplits";
-import { styled } from "../../stitches.config";
+
 
 const HooksEditor = dynamic(() => import("../../components/HooksEditor"), {
   ssr: false,
@@ -24,128 +19,6 @@ const LogBox = dynamic(() => import("../../components/LogBox"), {
   ssr: false,
 });
 
-const OptimizationText = () => (
-  <span>
-    Specify which optimization level to use for compiling. For example -O0 means
-    “no optimization”: this level compiles the fastest and generates the most
-    debuggable code. -O2 means moderate level of optimization which enables most
-    optimizations. Read more about the options from{" "}
-    <a
-      className="link"
-      rel="noopener noreferrer"
-      target="_blank"
-      href="https://clang.llvm.org/docs/CommandGuide/clang.html#cmdoption-o0"
-    >
-      clang documentation
-    </a>
-    .
-  </span>
-);
-
-const StyledOptimizationText = styled(OptimizationText, {
-  color: "$mauve12 !important",
-  fontSize: "200px",
-  "span a.link": {
-    color: "red",
-  },
-});
-
-const CompilerSettings = () => {
-  const snap = useSnapshot(state);
-  return (
-    <Flex css={{ minWidth: 200, flexDirection: "column", gap: "$5" }}>
-      <Box>
-        <Label
-          style={{
-            flexDirection: "row",
-            display: "flex",
-          }}
-        >
-          Optimization level{" "}
-          <Popover
-            css={{
-              maxWidth: "240px",
-              lineHeight: "1.3",
-              a: {
-                color: "$purple11",
-              },
-              ".dark &": {
-                backgroundColor: "$black !important",
-
-                ".arrow": {
-                  fill: "$colors$black",
-                },
-              },
-            }}
-            content={<StyledOptimizationText />}
-          >
-            <Flex
-              css={{
-                position: "relative",
-                top: "-1px",
-                ml: "$1",
-                backgroundColor: "$mauve8",
-                borderRadius: "$full",
-                cursor: "pointer",
-                width: "16px",
-                height: "16px",
-                alignItems: "center",
-                justifyContent: "center",
-              }}
-            >
-              ?
-            </Flex>
-          </Popover>
-        </Label>
-        <ButtonGroup css={{ mt: "$2", fontFamily: "$monospace" }}>
-          <Button
-            css={{ fontFamily: "$monospace" }}
-            outline={snap.compileOptions.optimizationLevel !== "-O0"}
-            onClick={() => (state.compileOptions.optimizationLevel = "-O0")}
-          >
-            -O0
-          </Button>
-          <Button
-            css={{ fontFamily: "$monospace" }}
-            outline={snap.compileOptions.optimizationLevel !== "-O1"}
-            onClick={() => (state.compileOptions.optimizationLevel = "-O1")}
-          >
-            -O1
-          </Button>
-          <Button
-            css={{ fontFamily: "$monospace" }}
-            outline={snap.compileOptions.optimizationLevel !== "-O2"}
-            onClick={() => (state.compileOptions.optimizationLevel = "-O2")}
-          >
-            -O2
-          </Button>
-          <Button
-            css={{ fontFamily: "$monospace" }}
-            outline={snap.compileOptions.optimizationLevel !== "-O3"}
-            onClick={() => (state.compileOptions.optimizationLevel = "-O3")}
-          >
-            -O3
-          </Button>
-          <Button
-            css={{ fontFamily: "$monospace" }}
-            outline={snap.compileOptions.optimizationLevel !== "-O4"}
-            onClick={() => (state.compileOptions.optimizationLevel = "-O4")}
-          >
-            -O4
-          </Button>
-          <Button
-            css={{ fontFamily: "$monospace" }}
-            outline={snap.compileOptions.optimizationLevel !== "-Os"}
-            onClick={() => (state.compileOptions.optimizationLevel = "-Os")}
-          >
-            -Os
-          </Button>
-        </ButtonGroup>
-      </Box>
-    </Flex>
-  );
-};
-
 const Home: NextPage = () => {
   const snap = useSnapshot(state);
 
@@ -161,7 +34,7 @@ const Home: NextPage = () => {
     >
       <main style={{ display: "flex", flex: 1, position: "relative" }}>
         <HooksEditor />
-        {snap.files[snap.active]?.name?.split(".")?.[1]?.toLowerCase() ===
+        {snap.files[snap.active]?.name?.split(".")?.[1].toLowerCase() ===
           "c" && (
           <Hotkeys
             keyName="command+b,ctrl+b"
@@ -169,7 +42,12 @@ const Home: NextPage = () => {
               !snap.compiling && snap.files.length && compileCode(snap.active)
             }
           >
-            <Flex
+            <Button
+              variant="primary"
+              uppercase
+              disabled={!snap.files.length}
+              isLoading={snap.compiling}
+              onClick={() => compileCode(snap.active)}
               css={{
                 position: "absolute",
                 bottom: "$4",
@@ -177,82 +55,27 @@ const Home: NextPage = () => {
                 alignItems: "center",
                 display: "flex",
                 cursor: "pointer",
-                gap: "$2",
               }}
             >
-              <Button
+              <Play weight="bold" size="16px" />
-                variant="primary"
+              Compile to Wasm
-                uppercase
+            </Button>
-                disabled={!snap.files.length}
-                isLoading={snap.compiling}
-                onClick={() => compileCode(snap.active)}
-              >
-                <Play weight="bold" size="16px" />
-                Compile to Wasm
-              </Button>
-              <Popover content={<CompilerSettings />}>
-                <Button variant="primary" css={{ px: "10px" }}>
-                  <Gear size="16px" />
-                </Button>
-              </Popover>
-            </Flex>
-          </Hotkeys>
-        )}
-        {snap.files[snap.active]?.name?.split(".")?.[1]?.toLowerCase() ===
-          "js" && (
-          <Hotkeys
-            keyName="command+b,ctrl+b"
-            onKeyDown={() =>
-              !snap.compiling && snap.files.length && compileCode(snap.active)
-            }
-          >
-            <Flex
-              css={{
-                position: "absolute",
-                bottom: "$4",
-                left: "$4",
-                alignItems: "center",
-                display: "flex",
-                cursor: "pointer",
-                gap: "$2",
-              }}
-            >
-              <RunScript file={snap.files[snap.active]} />
-            </Flex>
           </Hotkeys>
         )}
       </main>
-      <Flex css={{ width: "100%" }}>
+      <Box
-        <Flex
+        css={{
-          css={{
+          display: "flex",
-            flex: 1,
+          background: "$mauve1",
-            background: "$mauve1",
+          position: "relative",
-            position: "relative",
+        }}
-            borderRight: "1px solid $mauve8",
+      >
-          }}
+        <LogBox
-        >
+          title="Development Log"
-          <LogBox
+          clearLog={() => (state.logs = [])}
-            title="Development Log"
+          logs={snap.logs}
-            clearLog={() => (state.logs = [])}
+        />
-            logs={snap.logs}
+      </Box>
-          />
-        </Flex>
-        {snap.files[snap.active]?.name?.split(".")?.[1]?.toLowerCase() ===
-          "js" && (
-          <Flex
-            css={{
-              flex: 1,
-            }}
-          >
-            <LogBoxForScripts
-              showButtons={false}
-              title="Script Log"
-              logs={snap.scriptLogs}
-              clearLog={() => (state.scriptLogs = [])}
-            />
-          </Flex>
-        )}
-      </Flex>
     </Split>
   );
 };

pages/test/[[...slug]].tsx

@@ -1,13 +1,23 @@
 import dynamic from "next/dynamic";
+import { Play } from "phosphor-react";
+import { FC, useCallback, useEffect, useState } from "react";
 import Split from "react-split";
 import { useSnapshot } from "valtio";
-import { Box, Container, Flex, Tab, Tabs } from "../../components";
+import {
-import Transaction from "../../components/Transaction";
+  Box,
+  Button,
+  Container,
+  Flex,
+  Input,
+  Select,
+  Tab,
+  Tabs,
+  Text,
+} from "../../components";
+import transactionsData from "../../content/transactions.json";
 import state from "../../state";
+import { sendTransaction } from "../../state/actions";
 import { getSplit, saveSplit } from "../../state/actions/persistSplits";
-import { transactionsState, modifyTransaction } from "../../state";
-import LogBoxForScripts from "../../components/LogBoxForScripts";
-import { useEffect, useState } from "react";
 
 const DebugStream = dynamic(() => import("../../components/DebugStream"), {
   ssr: false,
@@ -20,33 +30,349 @@ const Accounts = dynamic(() => import("../../components/Accounts"), {
   ssr: false,
 });
 
-const Test = () => {
+// type SelectOption<T> = { value: T, label: string };
-  // This and useEffect is here to prevent useLayoutEffect warnings from react-split
+type TxFields = Omit<
-  const [showComponent, setShowComponent] = useState(false);
+  typeof transactionsData[0],
-  const { transactionLogs } = useSnapshot(state);
+  "Account" | "Sequence" | "TransactionType"
-  const { transactions, activeHeader } = useSnapshot(transactionsState);
+>;
-  const snap = useSnapshot(state);
+type OtherFields = (keyof Omit<TxFields, "Destination">)[];
-  useEffect(() => {
-    setShowComponent(true);
-  }, []);
-  if (!showComponent) {
-    return null;
-  }
-  const hasScripts = Boolean(
-    snap.files.filter((f) => f.name.toLowerCase()?.endsWith(".js")).length
-  );
 
+interface Props {
+  header?: string;
+}
+
+const Transaction: FC<Props> = ({ header, ...props }) => {
+  const snap = useSnapshot(state);
+
+  const transactionsOptions = transactionsData.map((tx) => ({
+    value: tx.TransactionType,
+    label: tx.TransactionType,
+  }));
+  const [selectedTransaction, setSelectedTransaction] = useState<
+    typeof transactionsOptions[0] | null
+  >(null);
+
+  const accountOptions = snap.accounts.map((acc) => ({
+    label: acc.name,
+    value: acc.address,
+  }));
+  const [selectedAccount, setSelectedAccount] = useState<
+    typeof accountOptions[0] | null
+  >(null);
+
+  const destAccountOptions = snap.accounts
+    .map((acc) => ({
+      label: acc.name,
+      value: acc.address,
+    }))
+    .filter((acc) => acc.value !== selectedAccount?.value);
+  const [selectedDestAccount, setSelectedDestAccount] = useState<
+    typeof destAccountOptions[0] | null
+  >(null);
+
+  const [txIsLoading, setTxIsLoading] = useState(false);
+  const [txIsDisabled, setTxIsDisabled] = useState(false);
+  const [txFields, setTxFields] = useState<TxFields>({});
+
+  useEffect(() => {
+    const transactionType = selectedTransaction?.value;
+    const account = snap.accounts.find(
+      (acc) => acc.address === selectedAccount?.value
+    );
+    if (!account || !transactionType || txIsLoading) {
+      setTxIsDisabled(true);
+    } else {
+      setTxIsDisabled(false);
+    }
+  }, [txIsLoading, selectedTransaction, selectedAccount, snap.accounts]);
+
+  useEffect(() => {
+    let _txFields: TxFields | undefined = transactionsData.find(
+      (tx) => tx.TransactionType === selectedTransaction?.value
+    );
+    if (!_txFields) return setTxFields({});
+    _txFields = { ..._txFields } as TxFields;
+
+    setSelectedDestAccount(null);
+    // @ts-ignore
+    delete _txFields.TransactionType;
+    // @ts-ignore
+    delete _txFields.Account;
+    // @ts-ignore
+    delete _txFields.Sequence;
+    setTxFields(_txFields);
+  }, [selectedTransaction, setSelectedDestAccount]);
+
+  const submitTest = useCallback(async () => {
+    const account = snap.accounts.find(
+      (acc) => acc.address === selectedAccount?.value
+    );
+    const TransactionType = selectedTransaction?.value;
+    if (!account || !TransactionType || txIsDisabled) return;
+
+    setTxIsLoading(true);
+    // setTxIsError(null)
+    try {
+      let options = { ...txFields };
+
+      options.Destination = selectedDestAccount?.value;
+      (Object.keys(options) as (keyof TxFields)[]).forEach((field) => {
+        let _value = options[field];
+        // convert currency
+        if (typeof _value === "object" && _value.type === "currency") {
+          if (+_value.value) {
+            options[field] = (+_value.value * 1000000 + "") as any;
+          } else {
+            options[field] = undefined; // 👇 💀
+          }
+        }
+        // handle type: `json`
+        if (typeof _value === "object" && _value.type === "json") {
+          if (typeof _value.value === "object") {
+            options[field] = _value.value as any;
+          } else {
+            try {
+              options[field] = JSON.parse(_value.value);
+            } catch (error) {
+              const message = `Input error for json field '${field}': ${
+                error instanceof Error ? error.message : ""
+              }`;
+              throw Error(message);
+            }
+          }
+        }
+
+        // delete unneccesary fields
+        if (!options[field]) {
+          delete options[field];
+        }
+      });
+      const logPrefix = header ? `${header.split(".")[0]}: ` : undefined;
+      await sendTransaction(
+        account,
+        {
+          TransactionType,
+          ...options,
+        },
+        { logPrefix }
+      );
+    } catch (error) {
+      console.error(error);
+      if (error instanceof Error) {
+        state.transactionLogs.push({ type: "error", message: error.message });
+      }
+    }
+    setTxIsLoading(false);
+  }, [
+    header,
+    selectedAccount?.value,
+    selectedDestAccount?.value,
+    selectedTransaction?.value,
+    snap.accounts,
+    txFields,
+    txIsDisabled,
+  ]);
+
+  const resetState = useCallback(() => {
+    setSelectedAccount(null);
+    setSelectedDestAccount(null);
+    setSelectedTransaction(null);
+    setTxFields({});
+    setTxIsDisabled(false);
+    setTxIsLoading(false);
+  }, []);
+
+  const usualFields = ["TransactionType", "Amount", "Account", "Destination"];
+  const otherFields = Object.keys(txFields).filter(
+    (k) => !usualFields.includes(k)
+  ) as OtherFields;
+  return (
+    <Box css={{ position: "relative", height: "calc(100% - 28px)" }} {...props}>
+      <Container
+        css={{
+          p: "$3 01",
+          fontSize: "$sm",
+          height: "calc(100% - 45px)",
+        }}
+      >
+        <Flex column fluid css={{ height: "100%", overflowY: "auto" }}>
+          <Flex
+            row
+            fluid
+            css={{
+              justifyContent: "flex-end",
+              alignItems: "center",
+              mb: "$3",
+              mt: "1px",
+              pr: "1px",
+            }}
+          >
+            <Text muted css={{ mr: "$3" }}>
+              Transaction type:{" "}
+            </Text>
+            <Select
+              instanceId="transactionsType"
+              placeholder="Select transaction type"
+              options={transactionsOptions}
+              hideSelectedOptions
+              css={{ width: "70%" }}
+              value={selectedTransaction}
+              onChange={(tt) => setSelectedTransaction(tt as any)}
+            />
+          </Flex>
+          <Flex
+            row
+            fluid
+            css={{
+              justifyContent: "flex-end",
+              alignItems: "center",
+              mb: "$3",
+              pr: "1px",
+            }}
+          >
+            <Text muted css={{ mr: "$3" }}>
+              Account:{" "}
+            </Text>
+            <Select
+              instanceId="from-account"
+              placeholder="Select your account"
+              css={{ width: "70%" }}
+              options={accountOptions}
+              value={selectedAccount}
+              onChange={(acc) => setSelectedAccount(acc as any)}
+            />
+          </Flex>
+          {txFields.Amount !== undefined && (
+            <Flex
+              row
+              fluid
+              css={{
+                justifyContent: "flex-end",
+                alignItems: "center",
+                mb: "$3",
+                pr: "1px",
+              }}
+            >
+              <Text muted css={{ mr: "$3" }}>
+                Amount (XRP):{" "}
+              </Text>
+              <Input
+                value={txFields.Amount.value}
+                onChange={(e) =>
+                  setTxFields({
+                    ...txFields,
+                    Amount: { type: "currency", value: e.target.value },
+                  })
+                }
+                css={{ width: "70%", flex: "inherit", height: "$9" }}
+              />
+            </Flex>
+          )}
+          {txFields.Destination !== undefined && (
+            <Flex
+              row
+              fluid
+              css={{
+                justifyContent: "flex-end",
+                alignItems: "center",
+                mb: "$3",
+                pr: "1px",
+              }}
+            >
+              <Text muted css={{ mr: "$3" }}>
+                Destination account:{" "}
+              </Text>
+              <Select
+                instanceId="to-account"
+                placeholder="Select the destination account"
+                css={{ width: "70%" }}
+                options={destAccountOptions}
+                value={selectedDestAccount}
+                isClearable
+                onChange={(acc) => setSelectedDestAccount(acc as any)}
+              />
+            </Flex>
+          )}
+          {otherFields.map((field) => {
+            let _value = txFields[field];
+            let value = typeof _value === "object" ? _value.value : _value;
+            value =
+              typeof value === "object"
+                ? JSON.stringify(value)
+                : value?.toLocaleString();
+            let isCurrency =
+              typeof _value === "object" && _value.type === "currency";
+            return (
+              <Flex
+                key={field}
+                row
+                fluid
+                css={{
+                  justifyContent: "flex-end",
+                  alignItems: "center",
+                  mb: "$3",
+                  pr: "1px",
+                }}
+              >
+                <Text muted css={{ mr: "$3" }}>
+                  {field + (isCurrency ? " (XRP)" : "")}:{" "}
+                </Text>
+                <Input
+                  value={value}
+                  onChange={(e) =>
+                    setTxFields({
+                      ...txFields,
+                      [field]:
+                        typeof _value === "object"
+                          ? { ..._value, value: e.target.value }
+                          : e.target.value,
+                    })
+                  }
+                  css={{ width: "70%", flex: "inherit", height: "$9" }}
+                />
+              </Flex>
+            );
+          })}
+        </Flex>
+      </Container>
+      <Flex
+        row
+        css={{
+          justifyContent: "space-between",
+          position: "absolute",
+          left: 0,
+          bottom: 0,
+          width: "100%",
+        }}
+      >
+        <Button outline>VIEW AS JSON</Button>
+        <Flex row>
+          <Button onClick={resetState} outline css={{ mr: "$3" }}>
+            RESET
+          </Button>
+          <Button
+            variant="primary"
+            onClick={submitTest}
+            isLoading={txIsLoading}
+            disabled={txIsDisabled}
+          >
+            <Play weight="bold" size="16px" />
+            RUN TEST
+          </Button>
+        </Flex>
+      </Flex>
+    </Box>
+  );
+};
+
+const Test = () => {
+  const { transactionLogs } = useSnapshot(state);
+  const [tabHeaders, setTabHeaders] = useState<string[]>(["test1.json"]);
   return (
     <Container css={{ px: 0 }}>
       <Split
         direction="vertical"
-        sizes={
+        sizes={getSplit("testVertical") || [50, 50]}
-          hasScripts && getSplit("testVertical")?.length === 2
-            ? [50, 20, 30]
-            : hasScripts
-            ? [50, 20, 50]
-            : [50, 50]
-        }
         gutterSize={4}
         gutterAlign="center"
         style={{ height: "calc(100vh - 60px)" }}
@@ -76,22 +402,19 @@ const Test = () => {
           >
             <Box css={{ width: "55%", px: "$2" }}>
               <Tabs
-                activeHeader={activeHeader}
-                // TODO make header a required field
-                onChangeActive={(idx, header) => {
-                  if (header) transactionsState.activeHeader = header;
-                }}
                 keepAllAlive
                 forceDefaultExtension
                 defaultExtension=".json"
-                onCreateNewTab={(header) => modifyTransaction(header, {})}
+                onCreateNewTab={(name) =>
-                onCloseTab={(idx, header) =>
+                  setTabHeaders(tabHeaders.concat(name))
-                  header && modifyTransaction(header, undefined)
+                }
+                onCloseTab={(index) =>
+                  setTabHeaders(tabHeaders.filter((_, idx) => idx !== index))
                 }
               >
-                {transactions.map(({ header, state }) => (
+                {tabHeaders.map((header) => (
                   <Tab key={header} header={header}>
-                    <Transaction state={state} header={header} />
+                    <Transaction header={header} />
                   </Tab>
                 ))}
               </Tabs>
@@ -101,23 +424,8 @@ const Test = () => {
             </Box>
           </Split>
         </Flex>
-        {hasScripts ? (
+
-          <Flex
+        <Flex row fluid>
-            as="div"
-            css={{
-              borderTop: "1px solid $mauve6",
-              background: "$mauve1",
-              flexDirection: "column",
-            }}
-          >
-            <LogBoxForScripts
-              title="Helper scripts"
-              logs={snap.scriptLogs}
-              clearLog={() => (state.scriptLogs = [])}
-            />
-          </Flex>
-        ) : null}
-        <Flex>
           <Split
             direction="horizontal"
             sizes={[50, 50]}

state/actions/compileCode.ts

@@ -35,11 +35,9 @@ export const compileCode = async (activeId: number) => {
       body: JSON.stringify({
         output: "wasm",
         compress: true,
-        strip: state.compileOptions.strip,
         files: [
           {
             type: "c",
-            options: state.compileOptions.optimizationLevel || '-O2',
             name: state.files[activeId].name,
             src: state.files[activeId].content,
           },

state/actions/deployHook.ts

@@ -4,22 +4,19 @@ import toast from "react-hot-toast";
 import state, { IAccount } from "../index";
 import calculateHookOn, { TTS } from "../../utils/hookOnCalculator";
 import { SetHookData } from "../../components/SetHookDialog";
-import { Link } from "../../components";
-import { ref } from "valtio";
-import estimateFee from "../../utils/estimateFee";
 
 export const sha256 = async (string: string) => {
   const utf8 = new TextEncoder().encode(string);
-  const hashBuffer = await crypto.subtle.digest("SHA-256", utf8);
+  const hashBuffer = await crypto.subtle.digest('SHA-256', utf8);
   const hashArray = Array.from(new Uint8Array(hashBuffer));
   const hashHex = hashArray
-    .map((bytes) => bytes.toString(16).padStart(2, "0"))
+    .map((bytes) => bytes.toString(16).padStart(2, '0'))
-    .join("");
+    .join('');
   return hashHex;
-};
+}
 
 function toHex(str: string) {
-  var result = "";
+  var result = '';
   for (var i = 0; i < str.length; i++) {
     result += str.charCodeAt(i).toString(16);
   }
@@ -50,36 +47,29 @@ function arrayBufferToHex(arrayBuffer?: ArrayBuffer | null) {
   return result;
 }
 
-export const prepareDeployHookTx = async (
+/* deployHook function turns the wasm binary into
-  account: IAccount & { name?: string },
+ * hex string, signs the transaction and deploys it to
-  data: SetHookData
+ * Hooks testnet.
-) => {
+ */
-  const activeFile = state.files[state.active]?.compiledContent
+export const deployHook = async (account: IAccount & { name?: string }, data: SetHookData) => {
-    ? state.files[state.active]
+  if (
-    : state.files.filter((file) => file.compiledContent)[0];
+    !state.files ||
-
+    state.files.length === 0 ||
-  if (!state.files || state.files.length === 0) {
+    !state.files?.[state.active]?.compiledContent
+  ) {
     return;
   }
 
-  if (!activeFile?.compiledContent) {
+  if (!state.files?.[state.active]?.compiledContent) {
     return;
   }
   if (!state.client) {
     return;
   }
   const HookNamespace = (await sha256(data.HookNamespace)).toUpperCase();
-  const hookOnValues: (keyof TTS)[] = data.Invoke.map((tt) => tt.value);
+  const hookOnValues: (keyof TTS)[] = data.Invoke.map(tt => tt.value);
   const { HookParameters } = data;
-  const filteredHookParameters = HookParameters.filter(
+  const filteredHookParameters = HookParameters.filter(hp => hp.HookParameter.HookParameterName && hp.HookParameter.HookParameterValue)?.map(aa => ({ HookParameter: { HookParameterName: toHex(aa.HookParameter.HookParameterName || ''), HookParameterValue: aa.HookParameter.HookParameterValue || '' } }));
-    (hp) =>
-      hp.HookParameter.HookParameterName && hp.HookParameter.HookParameterValue
-  )?.map((aa) => ({
-    HookParameter: {
-      HookParameterName: toHex(aa.HookParameter.HookParameterName || ""),
-      HookParameterValue: aa.HookParameter.HookParameterValue || "",
-    },
-  }));
   // const filteredHookGrants = HookGrants.filter(hg => hg.HookGrant.Authorize || hg.HookGrant.HookHash).map(hg => {
   //   return {
   //     HookGrant: {
@@ -89,52 +79,31 @@ export const prepareDeployHookTx = async (
   //     }
   //   }
   // });
+
   if (typeof window !== "undefined") {
     const tx = {
       Account: account.address,
       TransactionType: "SetHook",
       Sequence: account.sequence,
-      Fee: data.Fee,
+      Fee: "100000",
       Hooks: [
         {
           Hook: {
             CreateCode: arrayBufferToHex(
-              activeFile?.compiledContent
+              state.files?.[state.active]?.compiledContent
             ).toUpperCase(),
             HookOn: calculateHookOn(hookOnValues),
             HookNamespace,
             HookApiVersion: 0,
             Flags: 1,
             // ...(filteredHookGrants.length > 0 && { HookGrants: filteredHookGrants }),
-            ...(filteredHookParameters.length > 0 && {
+            ...(filteredHookParameters.length > 0 && { HookParameters: filteredHookParameters }),
-              HookParameters: filteredHookParameters,
+          }
-            }),
+        }
-          },
+      ]
-        },
-      ],
     };
-    return tx;
-  }
-};
 
-/* deployHook function turns the wasm binary into
- * hex string, signs the transaction and deploys it to
- * Hooks testnet.
- */
-export const deployHook = async (
-  account: IAccount & { name?: string },
-  data: SetHookData
-) => {
-  if (typeof window !== "undefined") {
-    const tx = await prepareDeployHookTx(account, data);
-    if (!tx) {
-      return;
-    }
-    if (!state.client) {
-      return;
-    }
     const keypair = derive.familySeed(account.secret);
-
     const { signedTransaction } = sign(tx, keypair);
     const currentAccount = state.accounts.find(
       (acc) => acc.address === account.address
@@ -143,9 +112,8 @@ export const deployHook = async (
       currentAccount.isLoading = true;
     }
     let submitRes;
-
     try {
-      submitRes = await state.client?.send({
+      submitRes = await state.client.send({
         command: "submit",
         tx_blob: signedTransaction,
       });
@@ -157,28 +125,12 @@ export const deployHook = async (
         });
         state.deployLogs.push({
           type: "success",
-          message: ref(
+          message: `[${submitRes.engine_result}] ${submitRes.engine_result_message} Validated ledger index: ${submitRes.validated_ledger_index}`,
-            <>
-              [{submitRes.engine_result}] {submitRes.engine_result_message}{" "}
-              Transaction hash:{" "}
-              <Link
-                as="a"
-                href={`https://${process.env.NEXT_PUBLIC_EXPLORER_URL}/${submitRes.tx_json?.hash}`}
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                {submitRes.tx_json?.hash}
-              </Link>
-            </>
-          ),
-          // message: `[${submitRes.engine_result}] ${submitRes.engine_result_message} Validated ledger index: ${submitRes.validated_ledger_index}`,
         });
       } else {
         state.deployLogs.push({
           type: "error",
-          message: `[${submitRes.engine_result || submitRes.error}] ${
+          message: `[${submitRes.engine_result || submitRes.error}] ${submitRes.engine_result_message || submitRes.error_exception}`,
-            submitRes.engine_result_message || submitRes.error_exception
-          }`,
         });
       }
     } catch (err) {
@@ -203,7 +155,7 @@ export const deleteHook = async (account: IAccount & { name?: string }) => {
     (acc) => acc.address === account.address
   );
   if (currentAccount?.isLoading || !currentAccount?.hooks.length) {
-    return;
+    return
   }
   if (typeof window !== "undefined") {
     const tx = {
@@ -216,20 +168,12 @@ export const deleteHook = async (account: IAccount & { name?: string }) => {
           Hook: {
             CreateCode: "",
             Flags: 1,
-          },
+          }
-        },
+        }
-      ],
+      ]
     };
 
     const keypair = derive.familySeed(account.secret);
-    try {
-      // Update tx Fee value with network estimation
-      const res = await estimateFee(tx, account);
-      tx["Fee"] = res?.base_fee ? res?.base_fee : "1000";
-    } catch (err) {
-      // use default value what you defined earlier
-      console.log(err);
-    }
     const { signedTransaction } = sign(tx, keypair);
 
     if (currentAccount) {
@@ -244,7 +188,7 @@ export const deleteHook = async (account: IAccount & { name?: string }) => {
       });
 
       if (submitRes.engine_result === "tesSUCCESS") {
-        toast.success("Hook deleted successfully ✅", { id: toastId });
+        toast.success('Hook deleted successfully ✅', { id: toastId })
         state.deployLogs.push({
           type: "success",
           message: "Hook deleted successfully ✅",
@@ -255,20 +199,15 @@ export const deleteHook = async (account: IAccount & { name?: string }) => {
         });
         currentAccount.hooks = [];
       } else {
-        toast.error(
+        toast.error(`${submitRes.engine_result_message || submitRes.error_exception}`, { id: toastId })
-          `${submitRes.engine_result_message || submitRes.error_exception}`,
-          { id: toastId }
-        );
         state.deployLogs.push({
           type: "error",
-          message: `[${submitRes.engine_result || submitRes.error}] ${
+          message: `[${submitRes.engine_result || submitRes.error}] ${submitRes.engine_result_message || submitRes.error_exception}`,
-            submitRes.engine_result_message || submitRes.error_exception
-          }`,
         });
       }
     } catch (err) {
       console.log(err);
-      toast.error("Error occured while deleting hoook", { id: toastId });
+      toast.error('Error occured while deleting hoook', { id: toastId })
       state.deployLogs.push({
         type: "error",
         message: "Error occured while deleting hook",

state/actions/downloadAsZip.ts

@@ -8,8 +8,7 @@ export const downloadAsZip = async () => {
         state.zipLoading = true
         // TODO do something about file/gist loading state
         const files = state.files.map(({ name, content }) => ({ name, content }));
-        const wasmFiles = state.files.filter(i => i.compiledContent).map(({ name, compiledContent }) => ({ name: `${name}.wasm`, content: compiledContent }));
+        const zipped = await createZip(files);
-        const zipped = await createZip([...files, ...wasmFiles]);
         const zipFileName = guessZipFileName(files);
         zipped.saveFile(zipFileName);
     } catch (error) {

state/actions/fetchFiles.ts

@@ -23,18 +23,16 @@ export const fetchFiles = (gistId: string) => {
           return res
         }
         // in case of templates, fetch header file(s) and append to res
+        let resHeaderJson;
         try {
           const resHeader = await fetch(`${process.env.NEXT_PUBLIC_COMPILE_API_BASE_URL}/api/header-files`);
           if (resHeader.ok) {
-            const resHeaderJson = await resHeader.json()
+            resHeaderJson = await resHeader.json();
-            const headerFiles: Record<string, { filename: string; content: string; language: string }> = {};
-            Object.entries(resHeaderJson).forEach(([key, value]) => {
-              const fname = `${key}.h`;
-              headerFiles[fname] = { filename: fname, content: value as string, language: 'C' }
-            })
             const files = {
               ...res.data.files,
-              ...headerFiles
+              'hookapi.h': res.data.files?.['hookapi.h'] || { filename: 'hookapi.h', content: resHeaderJson.hookapi, language: 'C' },
+              'hookmacro.h': res.data.files?.['hookmacro.h'] || { filename: 'hookmacro.h', content: resHeaderJson.hookmacro, language: 'C' },
+              'sfcodes.h': res.data.files?.['sfcodes.h'] || { filename: 'sfcodes.h', content: resHeaderJson.sfcodes, language: 'C' },
             };
             res.data.files = files;
           }
@@ -60,29 +58,6 @@ export const fetchFiles = (gistId: string) => {
             language: res.data.files?.[filename]?.language?.toLowerCase() || "",
             content: res.data.files?.[filename]?.content || "",
           }));
-          // Sort files so that the source files are first
-          // In case of other files leave the order as it its
-          files.sort((a, b) => {
-            const aBasename = a.name.split('.')?.[0];
-            const aCext = a.name?.toLowerCase().endsWith('.c');
-            const bBasename = b.name.split('.')?.[0];
-            const bCext = b.name?.toLowerCase().endsWith('.c');
-            // If a has c extension and b doesn't move a up
-            if (aCext && !bCext) {
-              return -1;
-            }
-            if (!aCext && bCext) {
-              return 1
-            }
-            // Otherwise fallback to default sorting based on basename
-            if (aBasename > bBasename) {
-              return 1;
-            }
-            if (bBasename > aBasename) {
-              return -1;
-            }
-            return 0;
-          })
           state.loading = false;
           if (files.length > 0) {
             state.logs.push({
@@ -114,4 +89,4 @@ export const fetchFiles = (gistId: string) => {
     return;
   }
   state.loading = false;
-};
+};

state/actions/saveFile.ts

@@ -15,13 +15,3 @@ export const saveFile = (showToast: boolean = true) => {
     toast.success("Saved successfully", { position: "bottom-center" });
   }
 };
-
-export const saveAllFiles = () => {
-  const editorModels = state.editorCtx?.getModels();
-  state.files.forEach(file => {
-    const currentModel = editorModels?.find(model => model.uri.path.endsWith('/' + file.name))
-    if (currentModel) {
-      file.content = currentModel?.getValue() || '';
-    }
-  })
-}

state/actions/sendTransaction.ts

@@ -20,11 +20,14 @@ export const sendTransaction = async (account: IAccount, txOptions: TransactionO
     const { Fee = "1000", ...opts } = txOptions
     const tx: TransactionOptions = {
         Account: account.address,
-        Sequence: account.sequence,
+        Sequence: account.sequence, // TODO auto-fillable
-        Fee,  // TODO auto-fillable default
+        Fee,  // TODO auto-fillable
         ...opts
     };
-
+    const currAcc = state.accounts.find(acc => acc.address === account.address);
+    if (currAcc) {
+        currAcc.sequence = account.sequence + 1;
+    }
     const { logPrefix = '' } = options || {}
     try {
         const signedAccount = derive.familySeed(account.secret);
@@ -44,10 +47,6 @@ export const sendTransaction = async (account: IAccount, txOptions: TransactionO
                 message: `${logPrefix}[${response.error || response.engine_result}] ${response.error_exception || response.engine_result_message}`,
             });
         }
-        const currAcc = state.accounts.find(acc => acc.address === account.address);
-        if (currAcc && response.account_sequence_next) {
-            currAcc.sequence = response.account_sequence_next;
-        }
     } catch (err) {
         console.error(err);
         state.transactionLogs.push({

state/actions/showAlert.ts

@@ -1,23 +0,0 @@
-import { ref } from 'valtio';
-import { AlertState, alertState } from "../../components/AlertDialog";
-
-export const showAlert = (title: string, opts: Omit<Partial<AlertState>, 'title' | 'isOpen'> = {}) => {
-    const { body: _body, confirmPrefix: _confirmPrefix, ...rest } = opts
-    const body = (_body && typeof _body === 'object') ? ref(_body) : _body
-    const confirmPrefix = (_confirmPrefix && typeof _confirmPrefix === 'object') ? ref(_confirmPrefix) : _confirmPrefix
-
-    const nwState: AlertState = {
-        isOpen: true,
-        title,
-        body,
-        confirmPrefix,
-        cancelText: undefined,
-        confirmText: undefined,
-        onCancel: undefined,
-        onConfirm: undefined,
-        ...rest,
-    }
-    Object.entries(nwState).forEach(([key, value]) => {
-        (alertState as any)[key] = value
-    })
-}

state/actions/syncToGist.ts

@@ -4,7 +4,6 @@ import { Octokit } from "@octokit/core";
 import Router from "next/router";
 
 import state from '../index';
-import { saveAllFiles } from "./saveFile";
 
 const octokit = new Octokit();
 
@@ -13,7 +12,6 @@ export const syncToGist = async (
   session?: Session | null,
   createNewGist?: boolean
 ) => {
-  saveAllFiles();
   let files: Record<string, { filename: string; content: string }> = {};
   state.gistLoading = true;
 

state/index.ts

@@ -35,18 +35,13 @@ export interface IAccount {
   hooks: string[];
   isLoading: boolean;
   version?: string;
-  error?: {
-    message: string;
-    code: string;
-  } | null;
 }
 
 export interface ILog {
   type: "error" | "warning" | "log" | "success";
-  message: string | JSX.Element;
+  message: string;
-  key?: string;
   jsonData?: any,
-  timestring?: string;
+  timestamp?: string;
   link?: string;
   linkText?: string;
   defaultCollapsed?: boolean
@@ -66,7 +61,6 @@ export interface IState {
   logs: ILog[];
   deployLogs: ILog[];
   transactionLogs: ILog[];
-  scriptLogs: ILog[];
   editorCtx?: typeof monaco.editor;
   editorSettings: {
     tabSize: number;
@@ -79,10 +73,6 @@ export interface IState {
   mainModalOpen: boolean;
   mainModalShowed: boolean;
   accounts: IAccount[];
-  compileOptions: {
-    optimizationLevel: '-O0' | '-O1' | '-O2' | '-O3' | '-O4' | '-Os';
-    strip: boolean
-  }
 }
 
 // let localStorageState: null | string = null;
@@ -97,7 +87,6 @@ let initialState: IState = {
   logs: [],
   deployLogs: [],
   transactionLogs: [],
-  scriptLogs: [],
   editorCtx: undefined,
   gistId: undefined,
   gistOwner: undefined,
@@ -113,10 +102,6 @@ let initialState: IState = {
   mainModalOpen: false,
   mainModalShowed: false,
   accounts: [],
-  compileOptions: {
-    optimizationLevel: '-O2',
-    strip: true
-  }
 };
 
 let localStorageAccounts: string | null = null;
@@ -174,5 +159,3 @@ if (typeof window !== "undefined") {
   });
 }
 export default state
-
-export * from './transactions'

state/transactions.ts

@@ -1,246 +0,0 @@
-import { proxy } from 'valtio';
-import { deepEqual } from '../utils/object';
-import transactionsData from "../content/transactions.json";
-import state from '.';
-import { showAlert } from "../state/actions/showAlert";
-import { parseJSON } from '../utils/json';
-
-export type SelectOption = {
-    value: string;
-    label: string;
-};
-
-export interface TransactionState {
-    selectedTransaction: SelectOption | null;
-    selectedAccount: SelectOption | null;
-    selectedDestAccount: SelectOption | null;
-    txIsLoading: boolean;
-    txIsDisabled: boolean;
-    txFields: TxFields;
-    viewType: 'json' | 'ui',
-    editorSavedValue: null | string,
-    editorValue?: string,
-    estimatedFee?: string
-}
-
-
-export type TxFields = Omit<
-    typeof transactionsData[0],
-    "Account" | "Sequence" | "TransactionType"
->;
-
-export const defaultTransaction: TransactionState = {
-    selectedTransaction: null,
-    selectedAccount: null,
-    selectedDestAccount: null,
-    txIsLoading: false,
-    txIsDisabled: false,
-    txFields: {},
-    viewType: 'ui',
-    editorSavedValue: null
-};
-
-export const transactionsState = proxy({
-    transactions: [
-        {
-            header: "test1.json",
-            state: defaultTransaction,
-        },
-    ],
-    activeHeader: "test1.json"
-});
-
-/**
- * Simple transaction state changer
- * @param header Unique key and tab name for the transaction tab
- * @param partialTx partial transaction state, `undefined` deletes the transaction
- * 
- */
-export const modifyTransaction = (
-    header: string,
-    partialTx?: Partial<TransactionState>,
-    opts: { replaceState?: boolean } = {}
-) => {
-    const tx = transactionsState.transactions.find(tx => tx.header === header);
-
-    if (partialTx === undefined) {
-        transactionsState.transactions = transactionsState.transactions.filter(
-            tx => tx.header !== header
-        );
-        return;
-    }
-
-    if (!tx) {
-        const state = {
-            ...defaultTransaction,
-            ...partialTx,
-        }
-        transactionsState.transactions.push({
-            header,
-            state,
-        });
-        return state;
-    }
-
-    if (opts.replaceState) {
-        const repTx: TransactionState = {
-            ...defaultTransaction,
-            ...partialTx,
-        }
-        tx.state = repTx
-        return repTx
-    }
-
-    Object.keys(partialTx).forEach(k => {
-        // Typescript mess here, but is definetly safe!
-        const s = tx.state as any;
-        const p = partialTx as any; // ? Make copy
-        if (!deepEqual(s[k], p[k])) s[k] = p[k];
-    });
-
-    return tx.state
-};
-
-// state to tx options
-export const prepareTransaction = (data: any) => {
-    let options = { ...data };
-
-    (Object.keys(options)).forEach(field => {
-        let _value = options[field];
-        // convert xrp
-        if (_value && typeof _value === "object" && _value.$type === "xrp") {
-            if (+_value.$value) {
-                options[field] = (+_value.$value * 1000000 + "") as any;
-            } else {
-                options[field] = undefined; // 👇 💀
-            }
-        }
-        // handle type: `json`
-        if (_value && typeof _value === "object" && _value.$type === "json") {
-            if (typeof _value.$value === "object") {
-                options[field] = _value.$value as any;
-            } else {
-                try {
-                    options[field] = JSON.parse(_value.$value);
-                } catch (error) {
-                    const message = `Input error for json field '${field}': ${error instanceof Error ? error.message : ""
-                        }`;
-                    console.error(message)
-                    options[field] = _value.$value
-                }
-            }
-        }
-
-        // delete unneccesary fields
-        if (options[field] === undefined) {
-            delete options[field];
-        }
-    });
-
-    return options
-}
-
-// editor value to state
-export const prepareState = (value: string, transactionType?: string) => {
-    const options = parseJSON(value);
-    if (!options) {
-        showAlert("Error!", {
-            body: "Cannot save editor with malformed transaction."
-        })
-        return
-    };
-
-    const { Account, TransactionType, Destination, ...rest } = options;
-    let tx: Partial<TransactionState> = {};
-    const txFields = getTxFields(transactionType)
-
-    if (Account) {
-        const acc = state.accounts.find(acc => acc.address === Account);
-        if (acc) {
-            tx.selectedAccount = {
-                label: acc.name,
-                value: acc.address,
-            };
-        } else {
-            tx.selectedAccount = {
-                label: Account,
-                value: Account,
-            };
-        }
-    } else {
-        tx.selectedAccount = null;
-    }
-
-    if (TransactionType) {
-        tx.selectedTransaction = {
-            label: TransactionType,
-            value: TransactionType,
-        };
-    } else {
-        tx.selectedTransaction = null;
-    }
-
-    if (txFields.Destination !== undefined) {
-        const dest = state.accounts.find(acc => acc.address === Destination);
-        rest.Destination = null
-        if (dest) {
-            tx.selectedDestAccount = {
-                label: dest.name,
-                value: dest.address,
-            };
-        }
-        else if (Destination) {
-            tx.selectedDestAccount = {
-                label: Destination,
-                value: Destination,
-            };
-        }
-        else {
-            tx.selectedDestAccount = null
-        }
-    }
-
-    Object.keys(rest).forEach(field => {
-        const value = rest[field];
-        const origValue = txFields[field as keyof TxFields]
-        const isXrp = typeof value !== 'object' && origValue && typeof origValue === 'object' && origValue.$type === 'xrp'
-        if (isXrp) {
-            rest[field] = {
-                $type: "xrp",
-                $value: +value / 1000000, // ! maybe use bigint?
-            };
-        } else if (typeof value === "object") {
-            rest[field] = {
-                $type: "json",
-                $value: value,
-            };
-        }
-    });
-
-    tx.txFields = rest;
-    tx.editorSavedValue = null;
-
-    return tx
-}
-
-export const getTxFields = (tt?: string) => {
-    const txFields: TxFields | undefined = transactionsData.find(
-        tx => tx.TransactionType === tt
-    );
-
-    if (!txFields) return {}
-
-    let _txFields = Object.keys(txFields)
-        .filter(
-            key => !["TransactionType", "Account", "Sequence"].includes(key)
-        )
-        .reduce<TxFields>(
-            (tf, key) => (
-                (tf[key as keyof TxFields] = (txFields as any)[key]), tf
-            ),
-            {}
-        );
-    return _txFields
-}
-
-export { transactionsData }

stitches.config.ts

@@ -9,20 +9,16 @@ import {
   grass,
   slate,
   mauve,
-  mauveA,
   amber,
   purple,
-  green,
   grayDark,
   blueDark,
   crimsonDark,
   grassDark,
   slateDark,
   mauveDark,
-  mauveDarkA,
   amberDark,
   purpleDark,
-  greenDark,
   red,
   redDark,
 } from "@radix-ui/colors";
@@ -45,10 +41,8 @@ export const {
       ...grass,
       ...slate,
       ...mauve,
-      ...mauveA,
       ...amber,
       ...purple,
-      ...green,
       ...red,
       accent: "#9D2DFF",
       background: "$gray1",
@@ -359,10 +353,8 @@ export const darkTheme = createTheme("dark", {
     ...grassDark,
     ...slateDark,
     ...mauveDark,
-    ...mauveDarkA,
     ...amberDark,
     ...purpleDark,
-    ...greenDark,
     ...redDark,
     deep: "rgb(10, 10, 10)",
     // backgroundA: transparentize(0.1, grayDark.gray1),

utils/estimateFee.ts

@@ -1,30 +0,0 @@
-import toast from 'react-hot-toast';
-import { derive, sign } from "xrpl-accountlib"
-import state, { IAccount } from "../state"
-
-const estimateFee = async (tx: Record<string, unknown>, account: IAccount, opts: { silent?: boolean } = {}): Promise<null | { base_fee: string, median_fee: string; minimum_fee: string; open_ledger_fee: string; }> => {
-  try {
-    const copyTx = JSON.parse(JSON.stringify(tx))
-    delete copyTx['SigningPubKey']
-    if (!copyTx.Fee) {
-      copyTx.Fee = '1000'
-    }
-    
-    const keypair = derive.familySeed(account.secret)
-    const { signedTransaction } = sign(copyTx, keypair);
-
-    const res = await state.client?.send({ command: 'fee', tx_blob: signedTransaction })
-    if (res && res.drops) {
-      return res.drops;
-    }
-    return null
-  } catch (err) {
-    if (!opts.silent) {
-      console.error(err)
-      toast.error("Cannot estimate fee.") // ? Some better msg
-    }
-    return null
-  }
-}
-
-export default estimateFee

utils/json.ts

@@ -18,14 +18,4 @@ export const extractJSON = (str?: string) => {
         } while (firstClose > firstOpen);
         firstOpen = str.indexOf('{', firstOpen + 1);
     } while (firstOpen != -1);
-}
-
-export const parseJSON = (str?: string | null): any | undefined => {
-    if (!str) return undefined
-    try {
-        const parsed = JSON.parse(str);
-        return typeof parsed === "object" ? parsed : undefined;
-    } catch (error) {
-        return undefined;
-    }
 }

utils/languageClient.ts

@@ -1,5 +1,6 @@
 import { MessageConnection } from "@codingame/monaco-jsonrpc";
 import { MonacoLanguageClient, ErrorAction, CloseAction, createConnection } from "@codingame/monaco-languageclient";
+import Router from "next/router";
 import normalizeUrl from "normalize-url";
 import ReconnectingWebSocket from "reconnecting-websocket";
 
@@ -13,7 +14,11 @@ export function createLanguageClient(connection: MessageConnection): MonacoLangu
       errorHandler: {
         error: () => ErrorAction.Continue,
         closed: () => {
-          return CloseAction.DoNotRestart
+          if (Router.pathname.includes('/develop')) {
+            return CloseAction.Restart
+          } else {
+            return CloseAction.DoNotRestart
+          }
         }
       },
 

utils/object.ts

@@ -1,24 +0,0 @@
-export const deepEqual = (object1: any, object2: any) => {
-    if (!isObject(object1) || !isObject(object2)) return object1 === object2
-
-    const keys1 = Object.keys(object1);
-    const keys2 = Object.keys(object2);
-    if (keys1.length !== keys2.length) {
-        return false;
-    }
-    for (const key of keys1) {
-        const val1 = object1[key];
-        const val2 = object2[key];
-        const areObjects = isObject(val1) && isObject(val2);
-        if (
-            areObjects && !deepEqual(val1, val2) ||
-            !areObjects && val1 !== val2
-        ) {
-            return false;
-        }
-    }
-    return true;
-}
-export const isObject = (object: any) => {
-    return object != null && typeof object === 'object';
-}

utils/schema.ts

@@ -1,39 +0,0 @@
-export const extractSchemaProps = <O extends object>(obj: O) => 
-    Object.entries(obj).reduce((prev, [key, val]) => {
-        const typeOf = <T>(arg: T) =>
-            arg instanceof Array
-                ? "array"
-                : arg === null
-                    ? "undefined"
-                    : typeof arg;
-
-        const value = (typeOf(val) === "object" && '$type' in val && '$value' in val) ? val?.$value : val;
-        const type = typeOf(value);
-
-        let schema: any = {
-            title: key,
-            type,
-            default: value,
-        }
-
-        if (typeOf(value) === 'array') {
-            const item = value[0] // TODO merge other item schema's into one
-            if (typeOf(item) !== 'object') {
-                schema.items = {
-                    type: 'object',
-                    properties: extractSchemaProps(item),
-                    default: item
-                }
-            }
-            // TODO support primitive-value arrays
-        }
-
-        if (typeOf(value) === "object") {
-            schema.properties = extractSchemaProps(value)
-        }
-        return {
-            ...prev,
-            [key]: schema,
-        };
-    }, {} as any);
-

xrpl-hooks-docs/docs.ts

@@ -3,7 +3,6 @@ import hooksAccountConvBufLen from "./md/hooks-account-conv-buf-len.md";
 import hooksAccountConvPure from "./md/hooks-account-conv-pure.md";
 import hooksArrayBufLen from "./md/hooks-array-buf-len.md";
 import hooksBurdenPrereq from "./md/hooks-burden-prereq.md";
-import hooksControlStringArg from "./md/hooks-control-string-arg.md";
 import hooksDetailBufLen from "./md/hooks-detail-buf-len.md";
 import hooksDetailPrereq from "./md/hooks-detail-prereq.md";
 import hooksEmitBufLen from "./md/hooks-emit-buf-len.md";
@@ -30,18 +29,15 @@ import hooksParamBufLen from "./md/hooks-param-buf-len.md";
 import hooksParamSetBufLen from "./md/hooks-param-set-buf-len.md";
 import hooksRaddrConvBufLen from "./md/hooks-raddr-conv-buf-len.md";
 import hooksRaddrConvPure from "./md/hooks-raddr-conv-pure.md";
-import hooksReleaseDefine from "./md/hooks-release-define.md";
 import hooksReserveLimit from "./md/hooks-reserve-limit.md";
 import hooksSlotHashBufLen from "./md/hooks-slot-hash-buf-len.md";
 import hooksSlotKeyletBufLen from "./md/hooks-slot-keylet-buf-len.md";
 import hooksSlotLimit from "./md/hooks-slot-limit.md";
 import hooksSlotSubLimit from "./md/hooks-slot-sub-limit.md";
 import hooksSlotTypeLimit from "./md/hooks-slot-type-limit.md";
-import hooksSkipHashBufLen from "./md/hooks-skip-hash-buf-len.md";
 import hooksStateBufLen from "./md/hooks-state-buf-len.md";
 import hooksTransactionHashBufLen from "./md/hooks-transaction-hash-buf-len.md";
 import hooksTransactionSlotLimit from "./md/hooks-transaction-slot-limit.md";
-import hooksTrivialCbak from "./md/hooks-trivial-cbak.md";
 import hooksValidateBufLen from "./md/hooks-validate-buf-len.md";
 import hooksVerifyBufLen from "./md/hooks-verify-buf-len.md";
 
@@ -53,7 +49,6 @@ const docs: { [key: string]: string; } = {
   "hooks-account-conv-pure": hooksAccountConvPure,
   "hooks-array-buf-len": hooksArrayBufLen,
   "hooks-burden-prereq": hooksBurdenPrereq,
-  "hooks-control-string-arg": hooksControlStringArg,
   "hooks-detail-buf-len": hooksDetailBufLen,
   "hooks-detail-prereq": hooksDetailPrereq,
   "hooks-emit-buf-len": hooksEmitBufLen,
@@ -80,18 +75,15 @@ const docs: { [key: string]: string; } = {
   "hooks-param-set-buf-len": hooksParamSetBufLen,
   "hooks-raddr-conv-buf-len": hooksRaddrConvBufLen,
   "hooks-raddr-conv-pure": hooksRaddrConvPure,
-  "hooks-release-define": hooksReleaseDefine,
   "hooks-reserve-limit": hooksReserveLimit,
   "hooks-slot-hash-buf-len": hooksSlotHashBufLen,
   "hooks-slot-keylet-buf-len": hooksSlotKeyletBufLen,
   "hooks-slot-limit": hooksSlotLimit,
   "hooks-slot-sub-limit": hooksSlotSubLimit,
   "hooks-slot-type-limit": hooksSlotTypeLimit,
-  "hooks-skip-hash-buf-len": hooksSkipHashBufLen,
   "hooks-state-buf-len": hooksStateBufLen,
   "hooks-transaction-hash-buf-len": hooksTransactionHashBufLen,
   "hooks-transaction-slot-limit": hooksTransactionSlotLimit,
-  "hooks-trivial-cbak": hooksTrivialCbak,
   "hooks-validate-buf-len": hooksValidateBufLen,
   "hooks-verify-buf-len": hooksVerifyBufLen,
 };

xrpl-hooks-docs/md/hooks-control-string-arg.md

@@ -1,5 +0,0 @@
-# hooks-control-string-arg
-
-Functions [accept](https://xrpl-hooks.readme.io/v2.0/reference/accept) and [rollback](https://xrpl-hooks.readme.io/v2.0/reference/rollback) take an optional string buffer stored outside the hook as its result message. This is useful for debugging but takes up space.
-
-For a release version, this check warns about constant strings passed to `accept` and `rollback`.

xrpl-hooks-docs/md/hooks-entry-points.md

@@ -1,7 +1,7 @@
 # hooks-entry-points
 
-A Hook always implements and exports a [hook](https://xrpl-hooks.readme.io/v2.0/reference/hook) function.
+A Hook always implements and exports exactly two functions: [cbak](https://xrpl-hooks.readme.io/v2.0/reference/cbak) and [hook](https://xrpl-hooks.readme.io/v2.0/reference/hook).
 
-This check shows error on translation units that do not have it.
+This check shows error on translation units that do not have them.
 
 [Read more](https://xrpl-hooks.readme.io/v2.0/docs/compiling-hooks)

xrpl-hooks-docs/md/hooks-hash-buf-len.md

@@ -1,5 +1,5 @@
 # hooks-hash-buf-len
 
-Functions [util_sha512h](https://xrpl-hooks.readme.io/v2.0/reference/util_sha512h), [hook_hash](https://xrpl-hooks.readme.io/v2.0/reference/hook_hash), [ledger_last_hash](https://xrpl-hooks.readme.io/v2.0/reference/ledger_last_hash), [etxn_nonce](https://xrpl-hooks.readme.io/v2.0/reference/etxn_nonce) and [ledger_nonce](https://xrpl-hooks.readme.io/v2.0/reference/ledger_nonce) have fixed-size hash output.
+Functions [util_sha512h](https://xrpl-hooks.readme.io/v2.0/reference/util_sha512h), [hook_hash](https://xrpl-hooks.readme.io/v2.0/reference/hook_hash), [ledger_last_hash](https://xrpl-hooks.readme.io/v2.0/reference/ledger_last_hash) and [nonce](https://xrpl-hooks.readme.io/v2.0/reference/nonce) have fixed-size hash output.
 
 This check warns about too-small size of their output buffer (if it's specified by a constant - variable parameter is ignored).

xrpl-hooks-docs/md/hooks-release-define.md

@@ -1,5 +0,0 @@
-# hooks-release-define
-
-Hook users can define a `NDEBUG` macro to disable tracing calls at compile time - but for the definition to be effective, it must be defined before including hook-specific headers.
-
-This check warns when `NDEBUG` is defined too late.

xrpl-hooks-docs/md/hooks-skip-hash-buf-len.md

@@ -1,5 +0,0 @@
-# hooks-skip-hash-buf-len
-
-Function [hook_skip](https://xrpl-hooks.readme.io/v2.0/reference/hook_skip) has fixed-size canonical hash input.
-
-This check warns about invalid size of its input buffer (if it's specified by a constant - variable parameter is ignored).

xrpl-hooks-docs/md/hooks-trivial-cbak.md

@@ -1,7 +0,0 @@
-# hooks-trivial-cbak
-
-A Hook may implement and export a [cbak](https://xrpl-hooks.readme.io/v2.0/reference/cbak) function.
-
-But the function is optional, and defining it so that it doesn't do anything besides returning a constant value is unnecessary (except for some debugging scenarios) and just increases the hook size. This check warns about such implementations.
-
-[Read more](https://xrpl-hooks.readme.io/v2.0/docs/compiling-hooks)