feat: upgrade playground to new payment-widget version (#15)

RequestNetwork · Oct 15, 2024 · 9503096 · 9503096
1 parent bbeefc4
commit 9503096
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rn-checkout",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -18,7 +18,7 @@
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-switch": "^1.1.0",
     "@radix-ui/react-tooltip": "^1.1.2",
-    "@requestnetwork/payment-widget": "^0.1.2",
+    "@requestnetwork/payment-widget": "^0.2.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.0",

diff --git a/src/components/Playground.tsx b/src/components/Playground.tsx
@@ -4,7 +4,7 @@ import { PropsValidation } from "@/lib/validation";
 import { zodResolver } from "@hookform/resolvers/zod";
 import PaymentWidget from "@requestnetwork/payment-widget/react";
 import { CopyIcon } from "lucide-react";
-import { useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import { Button } from "./ui/button";
@@ -21,6 +21,9 @@ import {
   AccordionTrigger,
 } from "./ui/accordion";
 
+import { cn } from "@/lib/utils";
+import { ZERO_ADDRESS } from "@/lib/constants";
+
 export const Playground = () => {
   const {
     register,
@@ -38,6 +41,8 @@ export const Playground = () => {
       buyerInfo: {},
       invoiceNumber: "",
       enableBuyerInfo: false,
+      feeAddress: ZERO_ADDRESS,
+      feeAmount: 0,
     },
   });
 
@@ -65,6 +70,10 @@ export const Playground = () => {
       formValues.supportedCurrencies?.length &&
         `supportedCurrencies={${JSON.stringify(formValues.supportedCurrencies)}}`,
       formValues.invoiceNumber && `invoiceNumber="${formValues.invoiceNumber}"`,
+      formValues.feeAddress &&
+        formValues.feeAddress !== ZERO_ADDRESS &&
+        `feeAddress="${formValues.feeAddress}"`,
+      formValues.feeAmount && `feeAmountInUSD={${formValues.feeAmount}}`,
     ]
       .filter(Boolean)
       .join("\n      ");
@@ -99,6 +108,13 @@ const YourComponent = () => {
     }
   };
 
+  useEffect(() => {
+    if (formValues.feeAddress?.length === 0) {
+      setValue("feeAddress", ZERO_ADDRESS);
+      setValue("feeAmount", 0);
+    }
+  }, [formValues.feeAddress, formValues.feeAmount]);
+
   return (
     <div className="flex flex-col gap-4 mt-4">
       <section className="flex flex-col gap-6 lg:gap-4 items-center md:items-start md:justify-between lg:flex-row">
@@ -359,10 +375,17 @@ const YourComponent = () => {
           </div>
           {/* Seller Address */}
           <div className="flex flex-col gap-2">
-            <Label>Seller address</Label>
+            <Label className="flex items-center">
+              Seller address
+              <span className="text-red-500 ml-1">*</span>
+            </Label>
             <Input
               placeholder="0x1234567890123456789012345678901234567890"
               {...register("sellerAddress")}
+              className={cn(
+                "border-2",
+                errors.sellerAddress ? "border-red-500" : "border-gray-200"
+              )}
             />
             {errors.sellerAddress?.message && (
               <Error>{errors.sellerAddress.message}</Error>
@@ -371,12 +394,19 @@ const YourComponent = () => {
 
           {/* Amount in USD */}
           <div className="flex flex-col gap-2">
-            <Label>Amount in USD</Label>
+            <Label className="flex items-center">
+              Amount in USD
+              <span className="text-red-500 ml-1">*</span>
+            </Label>
             <Input
               placeholder="25.55"
               {...register("amountInUSD", {
                 valueAsNumber: true,
               })}
+              className={cn(
+                "border-2",
+                errors.amountInUSD ? "border-red-500" : "border-gray-200"
+              )}
             />
             {errors.amountInUSD?.message && (
               <Error>{errors.amountInUSD.message}</Error>
@@ -392,10 +422,44 @@ const YourComponent = () => {
             )}
           </div>
 
+          {/* Fee */}
+          <div className="flex flex-col gap-2">
+            <Label>Fee Address</Label>
+            <Input
+              placeholder="0x1234567890123456789012345678901234567890"
+              {...register("feeAddress")}
+            />
+            {errors.feeAddress?.message && (
+              <Error>{errors.feeAddress.message}</Error>
+            )}
+            <Label>Fee Amount in USD</Label>
+            <Input
+              placeholder="25.55"
+              {...register("feeAmount", {
+                valueAsNumber: true,
+              })}
+            />
+            {errors.feeAmount?.message && (
+              <Error>{errors.feeAmount.message}</Error>
+            )}
+          </div>
+
           {/* Currencies */}
           <div className="flex flex-col gap-2">
-            <Label>Currencies</Label>
-            <CurrencyCombobox register={register} name="supportedCurrencies" />
+            <Label className="flex items-center">
+              Currencies
+              <span className="text-red-500 ml-1">*</span>
+            </Label>
+            <CurrencyCombobox
+              register={register}
+              name="supportedCurrencies"
+              className={cn(
+                "border-2",
+                errors.supportedCurrencies
+                  ? "border-red-500"
+                  : "border-gray-200"
+              )}
+            />
             <div className="flex items-center gap-2 flex-wrap">
               {formValues.supportedCurrencies?.map((currency) => {
                 return (
@@ -408,6 +472,9 @@ const YourComponent = () => {
                 );
               })}
             </div>
+            {errors.supportedCurrencies?.message && (
+              <Error>{errors.supportedCurrencies.message}</Error>
+            )}
           </div>
         </div>
         <div className="w-full lg:w-1/2">
@@ -426,6 +493,18 @@ const YourComponent = () => {
             // @ts-ignore
             supportedCurrencies={formValues.supportedCurrencies}
             invoiceNumber={formValues.invoiceNumber}
+            feeAddress={
+              formValues.feeAddress && formValues.feeAddress.length > 0
+                ? formValues.feeAddress
+                : ZERO_ADDRESS
+            }
+            feeAmountInUSD={
+              formValues.feeAddress &&
+              formValues.feeAddress.length > 0 &&
+              formValues.feeAddress !== ZERO_ADDRESS
+                ? formValues.feeAmount
+                : 0
+            }
           />
         </div>
       </section>

diff --git a/src/components/ui/combobox.tsx b/src/components/ui/combobox.tsx
@@ -29,9 +29,14 @@ const currencies = Object.entries(CURRENCY_ID).map(([key, value]) => ({
 interface CurrencyComboboxProps {
   register: UseFormRegister<any>;
   name: string;
+  className?: string;
 }
 
-export function CurrencyCombobox({ register, name }: CurrencyComboboxProps) {
+export function CurrencyCombobox({
+  register,
+  name,
+  className,
+}: CurrencyComboboxProps) {
   const [open, setOpen] = React.useState(false);
   const [selectedCurrencies, setSelectedCurrencies] = React.useState<string[]>(
     []
@@ -55,7 +60,7 @@ export function CurrencyCombobox({ register, name }: CurrencyComboboxProps) {
           variant="outline"
           role="combobox"
           aria-expanded={open}
-          className="w-[300px] justify-between"
+          className={cn("w-[300px] justify-between", className)}
         >
           {selectedCurrencies.length > 0
             ? `${selectedCurrencies.length} selected`

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
@@ -0,0 +1 @@
+export const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
diff --git a/src/lib/validation.ts b/src/lib/validation.ts
@@ -62,4 +62,13 @@ export const PropsValidation = z.object({
     .default([]),
   invoiceNumber: z.string().optional(),
   enableBuyerInfo: z.boolean().default(false),
+  feeAddress: z
+    .string()
+    .refine(isEthereumAddress, "Invalid fee address")
+    .optional()
+    .nullable(),
+  feeAmount: z
+    .number()
+    .gte(0, "Fee amount needs to be higher than 0")
+    .default(0),
 });