fix: wording

Author: bassgeta

src/components/ecommerce/manage/blocks/create-client.tsx

@@ -40,17 +40,17 @@ export function CreateEcommerceClient() {
       <DialogTrigger asChild>
         <Button>
           <Plus className="mr-2 h-4 w-4" />
-          Create Client ID
+          Create Ecommerce Client
         </Button>
       </DialogTrigger>
       <DialogContent>
         <DialogHeader>
-          <DialogTitle>Create New Client ID</DialogTitle>
+          <DialogTitle>Create New Ecommerce Client</DialogTitle>
         </DialogHeader>
         <EcommerceClientForm
           onSubmit={handleSubmit}
           isLoading={isLoading}
-          submitButtonText="Create Client ID"
+          submitButtonText="Create Client"
           onCancel={() => setIsOpen(false)}
         />
       </DialogContent>

src/components/ecommerce/manage/blocks/create-default-client.tsx

@@ -34,7 +34,7 @@ export function CreateDefaultEcommerceClient() {
       variant="default"
     >
       {isLoading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
-      Create Default Client ID
+      Create Default Client
     </Button>
   );
 }

src/components/ecommerce/manage/blocks/delete-client.tsx

@@ -51,15 +51,15 @@ export function DeleteEcommerceClient({
       <AlertDialogTrigger asChild>{children}</AlertDialogTrigger>
       <AlertDialogContent>
         <AlertDialogHeader>
-          <AlertDialogTitle>Delete Client ID</AlertDialogTitle>
+          <AlertDialogTitle>Delete Ecommerce Client</AlertDialogTitle>
           <AlertDialogDescription className="space-y-2">
             <p>
-              Are you sure you want to delete the client ID "
+              Are you sure you want to delete the client "
               {ecommerceClient.label}"?
             </p>
             <p className="font-medium text-red-600">
-              ⚠️ This action cannot be undone. The client ID will be permanently
-              removed and any integrations using it will stop working.
+              ⚠️ This action cannot be undone. The client will be permanently
+              removed and any integrations using it's ID will stop working.
             </p>
           </AlertDialogDescription>
         </AlertDialogHeader>

src/components/ecommerce/manage/blocks/edit-client.tsx

@@ -50,7 +50,7 @@ export function EditEcommerceClient({
       <DialogTrigger asChild>{children}</DialogTrigger>
       <DialogContent>
         <DialogHeader>
-          <DialogTitle>Edit Client ID</DialogTitle>
+          <DialogTitle>Edit Ecommerce Client</DialogTitle>
         </DialogHeader>
         <EcommerceClientForm
           onSubmit={handleSubmit}
@@ -63,7 +63,7 @@ export function EditEcommerceClient({
               ? Number(ecommerceClient.feePercentage)
               : undefined,
           }}
-          submitButtonText="Update Client ID"
+          submitButtonText="Update Client"
           onCancel={() => setIsOpen(false)}
         />
       </DialogContent>

src/components/ecommerce/manage/index.tsx

@@ -14,16 +14,16 @@ interface EcommerceManageProps {
 export function EcommerceManage({
   initialEcommerceClients,
 }: EcommerceManageProps) {
-  const shouldCreateDefault =
-    initialEcommerceClients.length === 0 ||
-    !initialEcommerceClients.some((c) => c.domain === DEFAULT_CLIENT_ID_DOMAIN);
   const { data, error, refetch, isRefetching } = api.ecommerce.getAll.useQuery(
     undefined,
     {
       initialData: initialEcommerceClients,
       refetchOnMount: true,
     },
   );
+  const shouldCreateDefault =
+    data.length === 0 ||
+    !data.some((c) => c.domain === DEFAULT_CLIENT_ID_DOMAIN);
 
   if (error) {
     return (

src/lib/schemas/ecommerce.ts

@@ -30,7 +30,11 @@ const baseEcommerceClientApiSchema = z.object({
   domain: z.string().url(),
   feeAddress: z
     .string()
-    .refine(isEthereumAddress, "Invalid Ethereum address format")
+    .refine((value) => {
+      if (value === undefined || value === "") return true;
+
+      return isEthereumAddress(value);
+    }, "Invalid Ethereum address format")
     .optional(),
   feePercentage: z.coerce
     .number()

src/server/routers/ecommerce.ts

@@ -40,15 +40,15 @@ export const ecommerceRouter = router({
             : {}),
         });
 
-        if (!response.data.ecommerceClient) {
-          throw new Error("Failed to create client ID via external API.");
+        if (!response.data.clientId) {
+          throw new Error("Failed to create client on external API.");
         }
 
         await db.insert(ecommerceClientTable).values({
           id: ulid(),
           userId: user.id,
           domain: input.domain,
-          externalId: response.data.ecommerceClient.id,
+          externalId: response.data.id,
           rnClientId: response.data.clientId,
           label: input.label,
           feeAddress: input.feeAddress,