Fix updating offchain account names

Author: gskril

client/src/components/AccountCard.tsx

@@ -102,6 +102,7 @@ export function AccountCard() {
 }
 
 const addAccountSchema = zfd.formData({
+  id: zfd.text(z.coerce.number().optional()),
   name: zfd.text(z.string().optional()),
   description: zfd.text(z.string().optional()),
   addressOrName: zfd.text(z.string().optional()),
@@ -164,6 +165,8 @@ function AccountDialog({
           onSubmit={handleAddAccount}
           className="flex flex-col gap-4"
         >
+          <input type="hidden" name="id" value={selectedAccount?.id} />
+
           <div className="flex flex-col gap-1.5">
             <Label htmlFor="name" className="gap-1">
               Name{' '}
@@ -173,7 +176,6 @@ function AccountDialog({
             </Label>
             <Input
               name="name"
-              placeholder="My Account"
               autoComplete="off"
               data-1p-ignore
               defaultValue={selectedAccount?.name}
@@ -187,19 +189,15 @@ function AccountDialog({
                 (optional)
               </span>
             </Label>
-            <Input
-              name="description"
-              placeholder="My Account"
-              autoComplete="off"
-            />
+            <Input name="description" autoComplete="off" />
           </div>
 
           <div className="flex flex-col gap-1.5">
             <Label htmlFor="addressOrName">Address or ENS name</Label>
             <Input
               name="addressOrName"
-              placeholder="0x1234567890123456789012345678901234567890"
               defaultValue={selectedAccount?.address ?? ''}
+              disabled={!!selectedAccount?.id}
               autoComplete="off"
               data-1p-ignore
             />

server/src/handlers/accounts.ts

@@ -66,6 +66,7 @@ export async function getAccounts(c: Context) {
 // }
 
 const addAccountSchema = z.object({
+  id: z.coerce.number().optional(),
   addressOrName: z.string().optional(),
   name: z.string().optional(),
   description: z.string().optional(),
@@ -79,7 +80,7 @@ export async function addAccount(c: Context) {
     return c.json({ error: safeParse.error }, 400)
   }
 
-  let { addressOrName, name, description } = safeParse.data
+  let { id, addressOrName, name, description } = safeParse.data
 
   if (!addressOrName && !name) {
     return c.json(
@@ -88,15 +89,28 @@ export async function addAccount(c: Context) {
     )
   }
 
+  // Handle offchain accounts
   if (!addressOrName) {
-    // Treat this as a manual account
-    await db
-      .insertInto('accounts')
-      .values({
-        name: name!,
-        description,
-      })
-      .execute()
+    if (id) {
+      // Update an existing offchain account
+      await db
+        .updateTable('accounts')
+        .set({
+          name,
+          description,
+        })
+        .where('id', '=', id)
+        .execute()
+    } else {
+      // Create a new offchain account
+      await db
+        .insertInto('accounts')
+        .values({
+          name: name!,
+          description,
+        })
+        .execute()
+    }
 
     return c.json({ success: true })
   }
@@ -137,21 +151,10 @@ export async function addAccount(c: Context) {
     .executeTakeFirst()
 
   if (existingAddress) {
-    // Treat this as an update
-    await db
-      .updateTable('accounts')
-      .set(data)
-      .where('id', '=', existingAddress.id)
-      .execute()
-
-    return c.json({ success: true })
+    return c.json({ error: 'Account already exists' }, 400)
   }
 
-  await db
-    .insertInto('accounts')
-    .values(data)
-    .onConflict((oc) => oc.column('id').doUpdateSet(data))
-    .execute()
+  await db.insertInto('accounts').values(data).execute()
 
   return c.json({ success: true })
 }