finish with edit wallet set dialog

packages/circle-demo-webapp/app/hooks/useTransactions.ts

@@ -9,12 +9,12 @@ interface UseTransactionsResult {
   refetch: () => Promise<void>;
 }
 
+const url = '/api/listTransactions';
+
 export const useTransactions = (walletId: string): UseTransactionsResult => {
-  const { data, error, isLoading } = useSWR<Transaction[], Error>(
-    `/api/listTransactions/${walletId}`,
-  );
+  const { data, error, isLoading } = useSWR<Transaction[], Error>(`${url}/${walletId}`);
 
-  const refetch = () => mutate(`/api/listTransactions/${walletId}`);
+  const refetch = () => mutate(`${url}/${walletId}`);
 
   return {
     data,

packages/circle-demo-webapp/app/hooks/useUpdateWalletSet.ts

@@ -0,0 +1,41 @@
+import { useState } from 'react';
+
+interface UpdateWalletSetArgs {
+  id: string;
+  name: string;
+}
+
+interface UseUpdateWalletSetResult {
+  error: Error | undefined;
+  isLoading: boolean;
+  updateWalletSet: (args: UpdateWalletSetArgs) => Promise<void>;
+}
+
+export const useUpdateWalletSet = (): UseUpdateWalletSetResult => {
+  const [error, setError] = useState<Error | undefined>(undefined);
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+
+  const updateWalletSet = async ({ id, name }: UpdateWalletSetArgs) => {
+    setIsLoading(true);
+    setError(undefined);
+    try {
+      await fetch('/api/updateWalletSet', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ id, name }),
+      });
+    } catch (err) {
+      setError(err as Error);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  return {
+    error,
+    isLoading,
+    updateWalletSet,
+  };
+};

packages/circle-demo-webapp/app/hooks/useWalletSets.ts

@@ -0,0 +1,25 @@
+import useSWR, { mutate } from 'swr';
+
+import { WalletSet } from '~/lib/types';
+
+interface UseWalletSetsResult {
+  data: WalletSet[] | undefined;
+  error: Error | undefined;
+  isLoading: boolean;
+  refetch: () => Promise<void>;
+}
+
+const url = '/api/listWalletSets';
+
+export const useWalletSets = (): UseWalletSetsResult => {
+  const { data, error, isLoading } = useSWR<WalletSet[], Error>(url);
+
+  const refetch = () => mutate(url);
+
+  return {
+    data,
+    error,
+    isLoading,
+    refetch,
+  };
+};

packages/circle-demo-webapp/app/routes/api.faucet.tsx

@@ -1,5 +1,4 @@
 import { ActionFunctionArgs } from '@remix-run/node';
-import { json } from '@remix-run/node';
 
 import { sdk } from '~/lib/sdk';
 import { ErrorResponseObject, TypeTestnetBlockchain } from '~/lib/types';
@@ -28,7 +27,7 @@ export async function action({ request }: ActionFunctionArgs) {
       native: true,
       usdc: true,
     });
-    return json({ message: 'Tokens requested successfully' });
+    return Response.json({ message: 'Success' });
   } catch (e: unknown) {
     return Response.json({ error: (e as ErrorResponseObject)?.response?.data });
   }

packages/circle-demo-webapp/app/routes/api.listWalletSets.tsx

@@ -0,0 +1,7 @@
+import { sdk } from '~/lib/sdk';
+
+export async function loader() {
+  const res = await sdk.listWalletSets();
+
+  return Response.json(res.data?.walletSets);
+}

packages/circle-demo-webapp/app/routes/api.updateWalletSet.tsx

@@ -1,9 +1,36 @@
-import { UpdateWalletSetInput } from '@circle-fin/developer-controlled-wallets';
 import { ActionFunctionArgs } from '@remix-run/node';
 
+import { invalidateCache } from '~/lib/cache';
 import { sdk } from '~/lib/sdk';
+import { ErrorResponseObject } from '~/lib/types';
+import { isValidString } from '~/lib/utils';
+
+interface RequestBody {
+  id: string;
+  name: string;
+}
 
 export async function action({ request }: ActionFunctionArgs) {
-  const res = await sdk.updateWalletSet((await request.json()) as UpdateWalletSetInput);
-  return Response.json(res.data);
+  const { id, name } = (await request.json()) as RequestBody;
+
+  if (!isValidString(id)) {
+    return Response.json({ error: 'Invalid wallet set id' });
+  }
+
+  if (!isValidString(name)) {
+    return Response.json({ error: 'Invalid name' });
+  }
+
+  try {
+    await sdk.updateWalletSet({
+      id,
+      name,
+    });
+
+    invalidateCache('walletSets');
+
+    return Response.json({ message: 'Success' });
+  } catch (e: unknown) {
+    return Response.json({ error: (e as ErrorResponseObject)?.response?.data });
+  }
 }

packages/circle-demo-webapp/app/routes/wallets.$id/components/EditWalletSetDialog.tsx

@@ -1,6 +1,5 @@
-import { useFetcher } from '@remix-run/react';
 import { FilePenLine, LoaderCircle } from 'lucide-react';
-import { useState } from 'react';
+import { FormEvent, useState } from 'react';
 
 import { Button } from '~/components/ui/button';
 import {
@@ -12,6 +11,7 @@ import {
   DialogTrigger,
 } from '~/components/ui/dialog';
 import { Input } from '~/components/ui/input';
+import { useUpdateWalletSet } from '~/hooks/useUpdateWalletSet';
 import { WalletSet } from '~/lib/types';
 
 interface EditWalletSetDialogProps {
@@ -20,7 +20,21 @@ interface EditWalletSetDialogProps {
 
 export function EditWalletSetDialog({ walletSet }: EditWalletSetDialogProps) {
   const [open, setOpen] = useState(false);
-  const fetcher = useFetcher();
+  const { updateWalletSet, isLoading, error } = useUpdateWalletSet();
+
+  const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+
+    const formData = new FormData(event.currentTarget);
+    const id = formData.get('id') as string;
+    const name = formData.get('name') as string;
+
+    void updateWalletSet({ id, name });
+
+    if (!isLoading && !error) {
+      setOpen(false);
+    }
+  };
 
   return (
     <Dialog open={open} onOpenChange={setOpen}>
@@ -36,13 +50,7 @@ export function EditWalletSetDialog({ walletSet }: EditWalletSetDialogProps) {
           <DialogDescription>Edit wallet set</DialogDescription>
         </DialogHeader>
 
-        <fetcher.Form
-          method="post"
-          action="/api/updateWalletSet"
-          onSubmit={() => {
-            setOpen(false);
-          }}
-        >
+        <form onSubmit={handleSubmit} className="space-y-4">
           <div className="w-full max-w-md mt-6">
             <input type="hidden" name="id" value={walletSet.id} />
             <Input
@@ -54,10 +62,11 @@ export function EditWalletSetDialog({ walletSet }: EditWalletSetDialogProps) {
             />
           </div>
           <Button type="submit" className="mt-6 w-full max-w-md">
-            {fetcher.state === 'submitting' && <LoaderCircle className="animate-spin" />}
+            {isLoading && <LoaderCircle className="animate-spin" />}
             Update
           </Button>
-        </fetcher.Form>
+          {error && <p className="text-red-500">{error.message}</p>}
+        </form>
       </DialogContent>
     </Dialog>
   );

packages/circle-demo-webapp/app/routes/wallets.$id/route.tsx

@@ -47,7 +47,7 @@ export async function action({ request }: ActionFunctionArgs) {
 
   await sdk.createWallets({
     walletSetId,
-    count: 1, // @todo: allow user to specify count
+    count: 1,
     blockchains: [blockchain as TypeBlockchain],
     metadata: [
       {