handled all campaign feedback

Author: Ebube111

src/common/contracts/core/campaigns/client.ts

@@ -64,23 +64,23 @@ export const update_campaign = ({
 }: {
   args: CampaignFormFields & { campaign_id: CampaignId };
 }) => {
-  return contractApi.call("update_campaign", {
+  return contractApi.call<{}, Campaign>("update_campaign", {
     args,
     deposit: floatToYoctoNear(0.021),
     gas: "300000000000000",
   });
 };
 
 export const delete_campaign = ({ args }: { args: { campaign_id: CampaignId } }) => {
-  return contractApi.call("delete_campaign", {
+  return contractApi.call<{}, Campaign>("delete_campaign", {
     args,
     deposit: floatToYoctoNear(0.021),
     gas: "300000000000000",
   });
 };
 
 export const donate = (args: DirectCampaignDonationArgs, depositAmountYocto: string) =>
-  contractApi.call("donate", {
+  contractApi.call<{}, Campaign>("donate", {
     args,
     deposit: depositAmountYocto,
     gas: "300000000000000",

src/common/ui/layout/components/molecules/social-share.tsx

@@ -17,9 +17,11 @@ import { Popover, PopoverContent, PopoverTrigger } from "../atoms/popover";
 export const SocialsShare = ({
   shareContent,
   variant = "icon",
+  shareText,
 }: {
   shareContent?: string;
   variant: "button" | "icon";
+  shareText: string;
 }) => {
   const [copied, setCopied] = useState(false);
 
@@ -58,7 +60,7 @@ export const SocialsShare = ({
               className="flex h-[48px] w-[48px] items-center justify-center rounded border border-[#DBDBDB] bg-[#F7F7F7]"
               onClick={() =>
                 window.open(
-                  `https://twitter.com/intent/tweet?url=${share}&text=Check this out on POTLOCK @potlock_`,
+                  `https://twitter.com/intent/tweet?url=${share}&text=${shareText}`,
                   "_blank",
                 )
               }

src/entities/campaign/components/CampaignBanner.tsx

@@ -1,5 +1,7 @@
 import { LazyLoadImage } from "react-lazy-load-image-component";
 
+import { PLATFORM_NAME } from "@/common/_config";
+import { PLATFORM_TWITTER_ACCOUNT_ID } from "@/common/constants";
 import { campaignsContractHooks } from "@/common/contracts/core/campaigns";
 import { yoctoNearToFloat } from "@/common/lib";
 import getTimePassed from "@/common/lib/getTimePassed";
@@ -113,7 +115,11 @@ export const CampaignBanner: React.FC<CampaignBannerProps> = ({ campaignId }) =>
             }
             {...{ campaignId }}
           />
-          <SocialsShare variant="button" />
+          <SocialsShare
+            shareText={`Support ${campaign?.name} Campaign on ${PLATFORM_NAME}  by donating or 
+                          sharing, every contribution Counts! ${PLATFORM_TWITTER_ACCOUNT_ID}`}
+            variant="button"
+          />
         </div>
       </div>
     </div>

src/entities/campaign/components/CampaignForm.tsx

@@ -25,7 +25,7 @@ export const CampaignForm = ({
 
   const isUpdate = campaignId !== undefined;
 
-  const { form, onChange, onSubmit, watch, isValid } = useCampaignForm({
+  const { form, onChange, onSubmit, watch, isDisabled } = useCampaignForm({
     campaignId,
   });
 
@@ -46,7 +46,7 @@ export const CampaignForm = ({
         form.setValue("max_amount", yoctoNearToFloat(existingData.max_amount));
       }
 
-      form.setValue("start_ms", existingData?.start_ms);
+      // form.setValue("start_ms", existingData?.start_ms);
 
       if (existingData?.end_ms) {
         form.setValue("end_ms", existingData?.end_ms);
@@ -167,7 +167,6 @@ export const CampaignForm = ({
                 className="appearance-none md:w-[42%]"
                 label="Target Amount"
                 required
-                onChange={(e) => field.onChange(Number(e.target.value))}
               />
             )}
           />
@@ -176,49 +175,42 @@ export const CampaignForm = ({
               control={form.control}
               name="min_amount"
               render={({ field }) => (
-                <NearInputField
-                  {...field}
-                  className="lg:w-90"
-                  label="Minimum Target Amount"
-                  onChange={(e) => field.onChange(Number(e.target.value))}
-                />
+                <NearInputField {...field} className="lg:w-90" label="Minimum Target Amount" />
               )}
             />
             <FormField
               control={form.control}
               name="max_amount"
               render={({ field }) => (
-                <NearInputField
-                  {...field}
-                  className="lg:w-90"
-                  label="Maximum Target Amount"
-                  onChange={(e) => field.onChange(Number(e.target.value))}
-                />
+                <NearInputField {...field} className="lg:w-90" label="Maximum Target Amount" />
               )}
             />
           </div>
           <div className="mt-8 flex w-full min-w-full flex-col justify-between md:flex-row">
-            <FormField
-              control={form.control}
-              name="start_ms"
-              render={({ field: { value, ...field } }) => (
-                <TextField
-                  {...field}
-                  required={!!watch("min_amount")}
-                  label="Start Date"
-                  value={
-                    typeof value === "number"
-                      ? Temporal.Instant.fromEpochMilliseconds(value)
-                          .toZonedDateTimeISO(Temporal.Now.timeZoneId())
-                          .toPlainDateTime()
-                          .toString({ smallestUnit: "minute" })
-                      : undefined
-                  }
-                  classNames={{ root: "lg:w-90" }}
-                  type="datetime-local"
+            {existingData?.start_ms &&
+              existingData?.start_ms > Temporal.Now.instant().epochMilliseconds && (
+                <FormField
+                  control={form.control}
+                  name="start_ms"
+                  render={({ field: { value, ...field } }) => (
+                    <TextField
+                      {...field}
+                      required={!campaignId}
+                      label="Start Date"
+                      value={
+                        typeof value === "number"
+                          ? Temporal.Instant.fromEpochMilliseconds(value)
+                              .toZonedDateTimeISO(Temporal.Now.timeZoneId())
+                              .toPlainDateTime()
+                              .toString({ smallestUnit: "minute" })
+                          : undefined
+                      }
+                      classNames={{ root: "lg:w-90" }}
+                      type="datetime-local"
+                    />
+                  )}
                 />
               )}
-            />
             <FormField
               control={form.control}
               name="end_ms"
@@ -242,7 +234,7 @@ export const CampaignForm = ({
             />
           </div>
           <div className="my-10 flex flex-row-reverse justify-between">
-            <Button variant="standard-filled" disabled={!isValid} type="submit">
+            <Button variant="standard-filled" disabled={isDisabled} type="submit">
               {isUpdate ? "Update" : "Create"} Campaign
             </Button>
           </div>

src/entities/campaign/components/CampaignProgressBar.tsx

@@ -34,7 +34,7 @@ export const CampaignProgressBar: React.FC<CampaignProgressBarProps> = ({
   const isTimeUp = timeLeft?.includes("-");
 
   const statusText = useMemo(() => {
-    if (targetMet || isTimeUp) {
+    if ((targetMet && endDate) || isTimeUp) {
       return "ENDED";
     } else if (isStarted) {
       return "NOT STARTED";

src/entities/campaign/components/CampaignSettings.tsx

@@ -140,7 +140,7 @@ export const CampaignSettings: React.FC<CampaignSettingsProps> = ({ campaignId }
               role="button"
               className="text-red-500"
             >
-              Edit Campaign
+              {openEditCampaign ? "Show Campaign Details" : "Edit Campaign"}
             </p>
           </div>
         )}

src/entities/campaign/hooks/forms.ts

@@ -1,9 +1,8 @@
-import { useCallback, useEffect } from "react";
+import { useCallback, useEffect, useMemo } from "react";
 
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useRouter } from "next/router";
 import { SubmitHandler, useForm, useWatch } from "react-hook-form";
-import { Temporal } from "temporal-polyfill";
 import { infer as FromSchema } from "zod";
 
 import { campaignsContractClient } from "@/common/contracts/core/campaigns";
@@ -13,29 +12,41 @@ import { toast } from "@/common/ui/layout/hooks";
 import { useWalletUserSession } from "@/common/wallet";
 import { dispatch } from "@/store";
 
-import { campaignFormSchema } from "../models/schema";
+import { createCampaignSchema, updateCampaignSchema } from "../models/schema";
 import { CampaignEnumType } from "../types";
 
 export const useCampaignForm = ({ campaignId }: { campaignId?: CampaignId }) => {
   const viewer = useWalletUserSession();
   const router = useRouter();
 
-  type Values = FromSchema<typeof campaignFormSchema>;
+  const schema = campaignId ? updateCampaignSchema : createCampaignSchema;
+
+  type Values = FromSchema<typeof schema>;
 
   const self = useForm<Values>({
-    resolver: zodResolver(campaignFormSchema),
+    resolver: zodResolver(schema),
     mode: "onChange",
     resetOptions: { keepDirtyValues: false },
   });
 
   const values = useWatch(self);
 
+  const isDisabled = useMemo(
+    () => !self.formState.isDirty || !self.formState.isValid || self.formState.isSubmitting,
+    [self.formState.isDirty, self.formState.isSubmitting, self.formState.isValid],
+  );
+
   useEffect(() => {
     const { min_amount, max_amount, target_amount } = values;
     const errors: Record<string, { message: string }> = {};
 
+    // Convert string values to numbers for comparison
+    const minAmount = min_amount ? Number(min_amount) : null;
+    const maxAmount = max_amount ? Number(max_amount) : null;
+    const targetAmount = target_amount ? Number(target_amount) : null;
+
     // Validate min_amount vs max_amount
-    if (min_amount && max_amount && min_amount > max_amount) {
+    if (minAmount && maxAmount && minAmount > maxAmount) {
       errors.min_amount = {
         message: "Minimum amount cannot be greater than maximum amount",
       };
@@ -46,7 +57,7 @@ export const useCampaignForm = ({ campaignId }: { campaignId?: CampaignId }) =>
     }
 
     // Validate target_amount vs max_amount
-    if (target_amount && max_amount && target_amount > max_amount) {
+    if (targetAmount && maxAmount && targetAmount > maxAmount) {
       errors.target_amount = {
         message: "Target amount cannot be greater than maximum amount",
       };
@@ -57,7 +68,7 @@ export const useCampaignForm = ({ campaignId }: { campaignId?: CampaignId }) =>
     }
 
     // Validate min_amount vs target_amount
-    if (min_amount && target_amount && min_amount > target_amount) {
+    if (minAmount && targetAmount && minAmount > targetAmount) {
       errors.min_amount = {
         message: "Minimum amount cannot be greater than target amount",
       };
@@ -169,9 +180,11 @@ export const useCampaignForm = ({ campaignId }: { campaignId?: CampaignId }) =>
           .update_campaign({
             args: { ...args, campaign_id: campaignId },
           })
-          .then(() => {
+          .then((updateValues) => {
+            console.log(updateValues);
+
             toast({
-              title: `You’ve successfully updated this Campaign`,
+              title: `You’ve successfully updated this ${updateValues.name} Campaign`,
             });
           })
           .catch((error) => {
@@ -220,8 +233,8 @@ export const useCampaignForm = ({ campaignId }: { campaignId?: CampaignId }) =>
   );
 
   const onChange = async (field: keyof Values, value: string) => {
-    self.setValue(field, value); // Update field value
-    await self.trigger(); // Trigger validation
+    self.setValue(field, value);
+    await self.trigger();
   };
 
   return {
@@ -236,7 +249,7 @@ export const useCampaignForm = ({ campaignId }: { campaignId?: CampaignId }) =>
     values,
     watch: self.watch,
     onChange,
-    isValid: Object.keys(self.formState.errors).length === 0,
+    isDisabled,
     handleDeleteCampaign,
     handleProcessEscrowedDonations,
     handleDonationsRefund,

src/entities/campaign/models/schema.ts

@@ -2,22 +2,28 @@ import { z } from "zod";
 
 import { NETWORK } from "@/common/_config";
 import { near } from "@/common/blockchains/near-protocol/client";
-import { futureTimestamp } from "@/common/lib";
+import { futureTimestamp, safePositiveNumber } from "@/common/lib";
 
-export const campaignFormSchema = z
+// Base schema with common fields
+const baseSchema = {
+  name: z
+    .string()
+    .min(3, "Name must be at least 3 characters")
+    .max(100, "Name must be less than 100 characters"),
+  description: z.string().max(250, "Description must be less than 100 characters"),
+  target_amount: safePositiveNumber.describe("Target Amount of the campaign"),
+  min_amount: safePositiveNumber.optional().describe("Minimum Amount of the Campaign"),
+  max_amount: safePositiveNumber.optional().describe("Maximum Amount of the Campaign"),
+  cover_image_url: z.string().optional(),
+  end_ms: futureTimestamp.describe("Campaign End Date"),
+  owner: z.string()?.optional(),
+};
+
+// Schema for creating new campaigns
+export const createCampaignSchema = z
   .object({
-    name: z
-      .string()
-      .min(3, "Name must be at least 3 characters")
-      .max(100, "Name must be less than 100 characters"),
-    description: z.string().max(250, "Description must be less than 100 characters"),
-    target_amount: z.number().min(0.1, "Target amount must be at least 0.1"),
-    min_amount: z.number().optional(),
-    max_amount: z.number().optional(),
-    cover_image_url: z.string().optional(),
+    ...baseSchema,
     start_ms: futureTimestamp.describe("Campaign Start Date"),
-    end_ms: futureTimestamp.describe("Campaign End Date"),
-    owner: z.string()?.optional(),
     recipient: z.string().refine(near.isAccountValid, {
       message: `Account does not exist on ${NETWORK}`,
     }),
@@ -37,3 +43,26 @@ export const campaignFormSchema = z
       });
     }
   });
+
+// Schema for updating existing campaigns
+export const updateCampaignSchema = z
+  .object({
+    ...baseSchema,
+    start_ms: futureTimestamp.optional().describe("Campaign Start Date"),
+    recipient: z.string().optional(),
+  })
+  .superRefine((data, ctx) => {
+    if (data.end_ms && data.start_ms && data.start_ms >= data.end_ms) {
+      ctx.addIssue({
+        path: ["start_ms"],
+        message: "Start time must be earlier than end time",
+        code: "custom",
+      });
+
+      ctx.addIssue({
+        path: ["end_ms"],
+        message: "End time must be later than start time",
+        code: "custom",
+      });
+    }
+  });

src/entities/list/components/ListDetails.tsx

@@ -8,7 +8,9 @@ import { FaHeart, FaRegHeart } from "react-icons/fa";
 import { LazyLoadImage } from "react-lazy-load-image-component";
 import { prop } from "remeda";
 
+import { PLATFORM_NAME } from "@/common/_config";
 import { List } from "@/common/api/indexer";
+import { PLATFORM_TWITTER_ACCOUNT_ID } from "@/common/constants";
 import { listsContractClient } from "@/common/contracts/core/lists";
 import { truncate } from "@/common/lib";
 import {
@@ -307,7 +309,11 @@ export const ListDetails = ({ admins, listId, listDetails, savedUsers }: ListDet
                 )}
               </button>
               <div className="font-semibold">{listDetails && listDetails?.upvotes?.length}</div>
-              <SocialsShare variant="icon" />
+              <SocialsShare
+                shareText={`support this List on ${PLATFORM_NAME}  by donating  to Projects or 
+                sharing—every contribution Counts! ${PLATFORM_TWITTER_ACCOUNT_ID}`}
+                variant="icon"
+              />
             </div>
           </div>
         </div>