npm - @paro.io/expert-shared-components - Versions diffs - 1.12.20 → 1.12.22 - Mend

@paro.io/expert-shared-components 1.12.20 → 1.12.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (70) hide show

package/lib/components/Invoices/DecisionSection.js CHANGED Viewed

@@ -73,6 +73,9 @@ const DecisionSection = ({ dispute, onUpdateDispute, updateInvoiceMutation, upda
     };
     const getTotalApprovedHours = () => {
         var _a;
+        if (resolution === 'DECLINED') {
+            return 0;
+        }
         if (resolution === 'PARTIAL' && ((_a = dispute === null || dispute === void 0 ? void 0 : dispute.disputeProjects) === null || _a === void 0 ? void 0 : _a.length) > 0) {
             return Object.values(projectApprovedHours).reduce((sum, hours) => sum + hours, 0);
         }
@@ -106,7 +109,7 @@ const DecisionSection = ({ dispute, onUpdateDispute, updateInvoiceMutation, upda
             const disputeProjectUpdates = ((_a = dispute === null || dispute === void 0 ? void 0 : dispute.disputeProjects) === null || _a === void 0 ? void 0 : _a.map((project) => ({
                 projectId: project.projectId,
                 resolutionMode: 'Direct',
-                resolutionType: resolutionType
+                resolutionType: resolution === 'DECLINED' ? 'Canceled' : resolutionType
             }))) || [];
             // Calculate approved amount based on dispute types
             const hasNonHourlyProjects = (_b = dispute === null || dispute === void 0 ? void 0 : dispute.disputeProjects) === null || _b === void 0 ? void 0 : _b.some((project) => project.disputeType !== 'Hourly');
@@ -181,9 +184,9 @@ const DecisionSection = ({ dispute, onUpdateDispute, updateInvoiceMutation, upda
                             react_1.default.createElement("div", { className: "text-xs text-gray-500" }, project.disputeType === 'Hourly'
                                 ? `Disputed Hours: ${project.disputeHours}`
                                 : `Dispute Amount: $${((_a = project.disputeAmount) === null || _a === void 0 ? void 0 : _a.toFixed(2)) || '0.00'}`)),
-                        react_1.default.createElement("div", { className: "w-32" }, project.disputeType === 'Hourly' ? (react_1.default.createElement("input", { type: "number", step: "0.01", min: "0", max: project.disputeHours, value: projectApprovedHours[project.projectId] || 0, onChange: (e) => handleProjectHoursChange(project.projectId, parseFloat(e.target.value) || 0), className: "w-full px-2 py-1 border border-[#CCCCCC] rounded text-sm focus:outline-none focus:ring-2 focus:ring-[#248384]", placeholder: "Hours" })) : (react_1.default.createElement("div", { className: "relative" },
+                        react_1.default.createElement("div", { className: "w-32" }, project.disputeType === 'Hourly' ? (react_1.default.createElement("input", { type: "number", step: "1", min: "0", max: project.disputeHours, value: projectApprovedHours[project.projectId] || '', onChange: (e) => handleProjectHoursChange(project.projectId, parseFloat(e.target.value) || 0), className: "w-full px-2 py-1 border border-[#CCCCCC] rounded text-sm focus:outline-none focus:ring-2 focus:ring-[#248384]", placeholder: "Hours" })) : (react_1.default.createElement("div", { className: "relative" },
                             react_1.default.createElement("span", { className: "absolute left-2 top-1/2 transform -translate-y-1/2 text-gray-500" }, "$"),
-                            react_1.default.createElement("input", { type: "number", step: "0.01", min: "0", max: project.disputeAmount, value: projectApprovedHours[project.projectId] || 0, onChange: (e) => handleProjectHoursChange(project.projectId, parseFloat(e.target.value) || 0), className: "w-full pl-2 pr-2 py-1 border border-[#CCCCCC] rounded text-sm focus:outline-none focus:ring-2 focus:ring-[#248384]", placeholder: "0.00" }))))));
+                            react_1.default.createElement("input", { type: "number", step: "1", min: "0", max: project.disputeAmount, value: projectApprovedHours[project.projectId] || '', onChange: (e) => handleProjectHoursChange(project.projectId, parseFloat(e.target.value) || 0), className: "w-full pl-2 pr-2 py-1 border border-[#CCCCCC] rounded text-sm focus:outline-none focus:ring-2 focus:ring-[#248384]", placeholder: "0.00" }))))));
                 })),
                 react_1.default.createElement("div", { className: "text-sm text-gray-600" }, dispute.disputeProjects.some((p) => p.disputeType === 'Hourly') &&
                     dispute.disputeProjects.some((p) => p.disputeType !== 'Hourly') ? (
@@ -215,7 +218,6 @@ const DecisionSection = ({ dispute, onUpdateDispute, updateInvoiceMutation, upda
                 // All non-hourly disputes
                 `Total Approved Amount: $${getTotalApprovedHours().toFixed(2)} / $${dispute.disputeProjects.reduce((sum, p) => sum + p.disputeAmount, 0).toFixed(2)}`)))),
             react_1.default.createElement("div", { className: "flex justify-end space-x-4" },
-                react_1.default.createElement(base_ui_1.Button, { label: "Decline Dispute", color: "error", onClick: () => handleResolutionChange('DECLINED'), disabled: isSubmitting, size: "md" }),
                 react_1.default.createElement(base_ui_1.Button, { label: "Approve & Resolve", color: "primary", onClick: handleApproveClick, isLoading: isSubmitting, disabled: !resolution || (resolution === 'PARTIAL' && !isValidPartialApproval()), size: "md" }))),
         react_1.default.createElement(ProjectHoursAdjustmentModal_1.ProjectHoursAdjustmentModal, { isOpen: showHoursModal, onClose: () => setShowHoursModal(false), disputeProjects: (dispute === null || dispute === void 0 ? void 0 : dispute.disputeProjects) || [], dispute: dispute, onSubmit: handleHoursSubmit, isSubmitting: isSubmitting, getClientInvoiceSummaryByMonth: getClientInvoiceSummaryByMonth, invoiceSummary: invoiceSummary, approvedHours: resolution === 'PARTIAL' ? getTotalApprovedHours() : totalDisputeHours, projectApprovedHours: isPartialWithMultipleProjects ? projectApprovedHours : {}, user: user })));
 };

package/lib/components/Invoices/InvoiceHeader.js CHANGED Viewed

@@ -10,35 +10,38 @@ const InvoiceHeader = ({ invoice, isInternal = false, isClient = false }) => {
     var _a, _b, _c, _d, _e, _f;
     const disputeAmount = (_a = invoice === null || invoice === void 0 ? void 0 : invoice.disputeProjects) === null || _a === void 0 ? void 0 : _a.reduce((acc, project) => acc + (project === null || project === void 0 ? void 0 : project.disputeAmount), 0);
     return (react_1.default.createElement("div", { className: "bg-[#0F172A] w-full text-white px-6 py-4 rounded-t-lg flex items-center justify-between font-arial" },
-        react_1.default.createElement("div", { className: "flex items-center space-x-8" },
+        react_1.default.createElement("div", { className: "flex items-center space-x-4 overflow-x-auto" },
+            react_1.default.createElement("div", { className: "flex-shrink-0" },
+                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Dispute #:"),
+                react_1.default.createElement("span", { className: "ml-1" }, invoice === null || invoice === void 0 ? void 0 : invoice.disputeId)),
+            react_1.default.createElement("div", { className: "flex-shrink-0" },
+                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Invoice #:"),
+                react_1.default.createElement("span", { className: "ml-1" }, (_b = invoice === null || invoice === void 0 ? void 0 : invoice.invoice) === null || _b === void 0 ? void 0 : _b.id)),
+            !isClient && (react_1.default.createElement("div", { className: "flex-shrink-0" },
+                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Client:"),
+                react_1.default.createElement("span", { className: "ml-1" }, (_c = invoice === null || invoice === void 0 ? void 0 : invoice.client) === null || _c === void 0 ? void 0 : _c.name))),
             react_1.default.createElement("div", null,
-                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Dispute Invoice #: "),
-                react_1.default.createElement("span", { className: "ml-2" }, (_b = invoice === null || invoice === void 0 ? void 0 : invoice.invoice) === null || _b === void 0 ? void 0 : _b.id)),
-            !isClient && (react_1.default.createElement("div", null,
-                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Client: "),
-                react_1.default.createElement("span", { className: "ml-2" }, (_c = invoice === null || invoice === void 0 ? void 0 : invoice.client) === null || _c === void 0 ? void 0 : _c.name))),
-            react_1.default.createElement("div", null,
-                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Amount: "),
-                react_1.default.createElement("span", { className: "ml-2" },
+                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Amount:"),
+                react_1.default.createElement("span", { className: "ml-1" },
                     "$",
                     disputeAmount)),
             react_1.default.createElement("div", null,
-                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Dispute Date: "),
-                react_1.default.createElement("span", { className: "ml-2" }, (0, dayjs_1.default)(invoice === null || invoice === void 0 ? void 0 : invoice.disputeDate).format('MMM D, YYYY'))),
+                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Date:"),
+                react_1.default.createElement("span", { className: "ml-1" }, (0, dayjs_1.default)(invoice === null || invoice === void 0 ? void 0 : invoice.disputeDate).format('MMM D, YYYY'))),
             react_1.default.createElement("div", null,
-                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Invoice Date: "),
-                react_1.default.createElement("span", { className: "ml-2" }, (0, dayjs_1.default)((_d = invoice === null || invoice === void 0 ? void 0 : invoice.invoice) === null || _d === void 0 ? void 0 : _d.dateGenerated).format('MMM D, YYYY'))),
+                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Invoice Date:"),
+                react_1.default.createElement("span", { className: "ml-1" }, (0, dayjs_1.default)((_d = invoice === null || invoice === void 0 ? void 0 : invoice.invoice) === null || _d === void 0 ? void 0 : _d.dateGenerated).format('MMM D, YYYY'))),
             react_1.default.createElement("div", null,
-                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Dispute Status: "),
-                react_1.default.createElement("span", { className: "ml-2" }, (invoice === null || invoice === void 0 ? void 0 : invoice.status) === "InProgress" ? "In Progress" : invoice === null || invoice === void 0 ? void 0 : invoice.status)),
-            (invoice === null || invoice === void 0 ? void 0 : invoice.approvedAmount) && (react_1.default.createElement("div", null,
-                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Approved Amount: "),
-                react_1.default.createElement("span", { className: "ml-2" },
+                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Status:"),
+                react_1.default.createElement("span", { className: "ml-1" }, (invoice === null || invoice === void 0 ? void 0 : invoice.status) === "InProgress" ? "In Progress" : invoice === null || invoice === void 0 ? void 0 : invoice.status)),
+            (invoice === null || invoice === void 0 ? void 0 : invoice.approvedAmount) >= 0 && (invoice === null || invoice === void 0 ? void 0 : invoice.status) === 'Resolved' && (react_1.default.createElement("div", null,
+                react_1.default.createElement("span", { className: "text-sm font-bold" }, "Approved Amount:"),
+                react_1.default.createElement("span", { className: "ml-1" },
                     "$", invoice === null || invoice === void 0 ? void 0 :
                     invoice.approvedAmount))),
             !isInternal && (react_1.default.createElement("div", null,
                 react_1.default.createElement("span", { className: "text-sm font-bold" }, "Expert Name: "),
-                react_1.default.createElement("span", { className: "ml-2" }, (_e = invoice === null || invoice === void 0 ? void 0 : invoice.freelancer) === null || _e === void 0 ? void 0 :
+                react_1.default.createElement("span", { className: "ml-1" }, (_e = invoice === null || invoice === void 0 ? void 0 : invoice.freelancer) === null || _e === void 0 ? void 0 :
                     _e.firstName,
                     " ", (_f = invoice === null || invoice === void 0 ? void 0 : invoice.freelancer) === null || _f === void 0 ? void 0 :
                     _f.lastName))))));

package/lib/components/Invoices/ProjectHoursAdjustmentModal.js CHANGED Viewed

@@ -69,12 +69,9 @@ const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute
         setLoading(true);
         try {
             if ((_a = invoiceSummary === null || invoiceSummary === void 0 ? void 0 : invoiceSummary.getClientInvoiceSummaryByMonth) === null || _a === void 0 ? void 0 : _a.projects) {
-                // Group tasks by project based on disputeProjects
                 const projectSectionsData = [];
                 disputeProjects.forEach(disputeProject => {
-                    // Find matching project in invoice summary
                     const invoiceProject = invoiceSummary.getClientInvoiceSummaryByMonth.projects.find((proj) => {
-                        // Match by project name since we don't have direct projectId mapping
                         return proj.projectName === disputeProject.project.name;
                     });
                     if (invoiceProject) {
@@ -90,14 +87,23 @@ const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute
                     }
                 });
                 setProjectSections(projectSectionsData);
-                // Initialize adjusted hours for all tasks
                 const initialAdjustedHours = {};
                 projectSectionsData.forEach(section => {
                     section.tasks.forEach(task => {
-                        initialAdjustedHours[task.projectHourId] = {
-                            originalHours: task.hours,
-                            newHours: task.hours
-                        };
+                        if (section.disputeType !== 'Hourly') {
+                            initialAdjustedHours[task.projectHourId] = {
+                                originalAmount: parseFloat((task.hours * task.rate).toFixed(2)),
+                                newAmount: parseFloat((task.hours * task.rate).toFixed(2)),
+                                originalHours: parseFloat(task.hours.toFixed(2)),
+                                newHours: parseFloat(task.hours.toFixed(2))
+                            };
+                        }
+                        else {
+                            initialAdjustedHours[task.projectHourId] = {
+                                originalHours: parseFloat(task.hours.toFixed(2)),
+                                newHours: parseFloat(task.hours.toFixed(2))
+                            };
+                        }
                     });
                 });
                 setAdjustedHours(initialAdjustedHours);
@@ -115,12 +121,10 @@ const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute
     });
     const handleHourChange = (projectHourId, newHours) => {
         var _a;
-        const numericValue = parseFloat(newHours) || 0;
+        const numericValue = parseFloat(newHours);
         const originalHours = ((_a = adjustedHours[projectHourId]) === null || _a === void 0 ? void 0 : _a.originalHours) || 0;
         setAdjustedHours(prev => (Object.assign(Object.assign({}, prev), { [projectHourId]: Object.assign(Object.assign({}, prev[projectHourId]), { newHours: numericValue }) })));
-        // Clear individual hour error
         setErrors(prev => (Object.assign(Object.assign({}, prev), { [projectHourId]: '' })));
-        // Validate individual hour
         if (numericValue > originalHours) {
             setErrors(prev => (Object.assign(Object.assign({}, prev), { [projectHourId]: 'New hours cannot exceed original hours' })));
         }
@@ -128,6 +132,19 @@ const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute
             setErrors(prev => (Object.assign(Object.assign({}, prev), { [projectHourId]: 'Hours cannot be negative' })));
         }
     };
+    const handleAmountChange = (projectHourId, newAmount) => {
+        var _a;
+        const numericValue = parseFloat(newAmount);
+        const originalAmount = ((_a = adjustedHours[projectHourId]) === null || _a === void 0 ? void 0 : _a.originalAmount) || 0;
+        setAdjustedHours(prev => (Object.assign(Object.assign({}, prev), { [projectHourId]: Object.assign(Object.assign({}, prev[projectHourId]), { newAmount: numericValue }) })));
+        setErrors(prev => (Object.assign(Object.assign({}, prev), { [projectHourId]: '' })));
+        if (numericValue > originalAmount) {
+            setErrors(prev => (Object.assign(Object.assign({}, prev), { [projectHourId]: 'New Dispute Amount cannot exceed original Amount' })));
+        }
+        else if (numericValue < 0) {
+            setErrors(prev => (Object.assign(Object.assign({}, prev), { [projectHourId]: 'Dispute Amount cannot be negative' })));
+        }
+    };
     const getProjectTotalHours = (projectId, type) => {
         const section = projectSections.find(s => s.projectId === projectId);
         if (!section)
@@ -136,7 +153,7 @@ const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute
             const adjustment = adjustedHours[task.projectHourId];
             if (!adjustment)
                 return total;
-            return total + (type === 'original' ? adjustment.originalHours : adjustment.newHours);
+            return total + (type === 'original' ? adjustment.originalHours || 0 : adjustment.newHours || 0);
         }, 0);
     };
     const getProjectTotalAmount = (projectId, type) => {
@@ -147,8 +164,8 @@ const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute
             const adjustment = adjustedHours[task.projectHourId];
             if (!adjustment)
                 return total;
-            const hours = type === 'original' ? adjustment.originalHours : adjustment.newHours;
-            return total + (hours * task.rate); // Calculate amount based on hours * rate
+            const newAmount = type === 'original' ? adjustment.originalAmount || 0 : adjustment.newAmount || 0;
+            return total + newAmount; // Calculate amount based on hours * rate
         }, 0);
     };
     const getProjectReduction = (projectId) => {
@@ -167,32 +184,37 @@ const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute
         let hasErrors = false;
         const newErrors = {};
         const newProjectErrors = {};
-        // Validate each project section
         projectSections.forEach(section => {
             const projectId = section.projectId;
-            const disputeHours = section.disputeHours;
-            // Use project-specific approved hours if available, otherwise use dispute hours
             const maxAllowedReduction = projectApprovedHours[projectId] !== undefined
                 ? projectApprovedHours[projectId]
                 : section.disputeType === 'Hourly'
                     ? section.disputeHours
                     : section.disputeAmount;
-            // Validate individual hours within this project
             section.tasks.forEach(task => {
-                var _a, _b;
+                var _a, _b, _c, _d;
                 const projectHourId = task.projectHourId;
                 const originalHours = ((_a = adjustedHours[projectHourId]) === null || _a === void 0 ? void 0 : _a.originalHours) || 0;
-                const newHours = ((_b = adjustedHours[projectHourId]) === null || _b === void 0 ? void 0 : _b.newHours) || 0;
-                if (newHours > originalHours) {
+                const newHours = (_b = adjustedHours[projectHourId]) === null || _b === void 0 ? void 0 : _b.newHours;
+                const newAmount = (_c = adjustedHours[projectHourId]) === null || _c === void 0 ? void 0 : _c.newAmount;
+                const originalAmount = ((_d = adjustedHours[projectHourId]) === null || _d === void 0 ? void 0 : _d.originalAmount) || 0;
+                if (newHours && newHours > originalHours) {
                     newErrors[projectHourId] = 'New hours cannot exceed original hours';
                     hasErrors = true;
                 }
-                else if (newHours < 0) {
+                else if (newHours && newHours < 0) {
                     newErrors[projectHourId] = 'Hours cannot be negative';
                     hasErrors = true;
                 }
+                else if (newAmount && newAmount < 0) {
+                    newErrors[projectHourId] = 'Dispute Amount cannot be negative';
+                    hasErrors = true;
+                }
+                else if (newAmount && newAmount > originalAmount) {
+                    newErrors[projectHourId] = 'New Dispute Amount cannot exceed original Amount';
+                    hasErrors = true;
+                }
             });
-            // Validate project-level hour reduction
             const projectReduction = getProjectReduction(projectId);
             if (Math.abs(projectReduction - maxAllowedReduction) > 0.01) {
                 const reductionType = projectApprovedHours[projectId] !== undefined ? 'approved' : 'disputed';
@@ -204,40 +226,30 @@ const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute
         setErrors(newErrors);
         setProjectErrors(newProjectErrors);
         if (!hasErrors) {
-            // Generate the submission data in the required format
             let freelancerRate = 0;
             const inputArray = [];
             projectSections.forEach(section => {
                 section.tasks.forEach(task => {
                     const projectHourId = task.projectHourId;
                     const adjustedHour = adjustedHours[projectHourId];
+                    const newHours = adjustedHour === null || adjustedHour === void 0 ? void 0 : adjustedHour.newHours;
                     freelancerRate = task.freelancerRate;
-                    // Calculate hours based on dispute type
-                    let calculatedHours = (adjustedHour === null || adjustedHour === void 0 ? void 0 : adjustedHour.newHours) || 0;
+                    let calculatedHours = newHours || 0;
                     if (section.disputeType !== 'Hourly') {
-                        // For non-hourly projects, calculate hour equivalent based on approved dispute amount ratio
                         const approvedDisputeAmount = projectApprovedHours[section.projectId] !== undefined
                             ? projectApprovedHours[section.projectId]
                             : section.disputeAmount;
                         const totalProjectAmount = section.totalProjectAmount;
                         if (totalProjectAmount > 0) {
-                            // Calculate the ratio of approved dispute amount to total project amount
                             const disputeRatio = approvedDisputeAmount / totalProjectAmount;
-                            // Apply this ratio to the original hours for this task
                             const originalTaskHours = (adjustedHour === null || adjustedHour === void 0 ? void 0 : adjustedHour.originalHours) || 0;
-                            // The reduction in hours should be proportional to the dispute ratio
                             const hourReduction = originalTaskHours * disputeRatio;
                             calculatedHours = originalTaskHours - hourReduction;
-                            // Ensure hours don't go negative
-                            calculatedHours = Math.max(0, calculatedHours);
+                            calculatedHours = Number(Math.max(0, calculatedHours).toFixed(4));
                         }
                     }
-                    // Generate expert name
-                    const expertName = (dispute === null || dispute === void 0 ? void 0 : dispute.freelancer) ?
-                        `${dispute.freelancer.firstName} ${dispute.freelancer.lastName}` : '';
-                    // Generate internal user name
-                    const internalUser = user ?
-                        `${user.firstName} ${user.lastName}` : '';
+                    const expertName = (dispute === null || dispute === void 0 ? void 0 : dispute.freelancer) ? `${dispute.freelancer.firstName} ${dispute.freelancer.lastName}` : '';
+                    const internalUser = user ? `${user.firstName} ${user.lastName}` : '';
                     inputArray.push({
                         clientRate: task.rate,
                         freelancerRate: task.freelancerRate,
@@ -301,7 +313,7 @@ const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute
                 : "Please enter the new hours to settle the dispute for each of the project time log entries below"),
             react_1.default.createElement("div", { className: "space-y-8" }, projectSections.map((section) => {
                 var _a, _b;
-                const projectReduction = getProjectReduction(section.projectId);
+                const projectReduction = getProjectReduction(section.projectId) || 0;
                 const maxAllowedReduction = projectApprovedHours[section.projectId] !== undefined
                     ? projectApprovedHours[section.projectId]
                     : section.disputeType === 'Hourly'
@@ -359,26 +371,24 @@ const ProjectHoursAdjustmentModal = ({ isOpen, onClose, disputeProjects, dispute
                                     react_1.default.createElement("th", { className: "border border-gray-300 px-4 py-2 text-left" }, section.disputeType === 'Hourly' ? 'Original Hours' : 'Original Dispute $'),
                                     react_1.default.createElement("th", { className: "border border-gray-300 px-4 py-2 text-left" }, section.disputeType === 'Hourly' ? 'Adjusted Hours' : 'Adjusted $ Amount'))),
                             react_1.default.createElement("tbody", null, section.tasks.map((task) => {
-                                var _a, _b;
+                                var _a, _b, _c;
                                 const projectHourId = task.projectHourId;
                                 const originalHours = task.hours;
                                 const originalAmount = task.hours * task.rate;
-                                const newHours = ((_a = adjustedHours[projectHourId]) === null || _a === void 0 ? void 0 : _a.newHours) || 0;
-                                const newAmount = newHours * task.rate;
+                                const newHours = (_a = adjustedHours[projectHourId]) === null || _a === void 0 ? void 0 : _a.newHours;
+                                const newAmount = (_b = adjustedHours[projectHourId]) === null || _b === void 0 ? void 0 : _b.newAmount;
                                 const hasError = errors[projectHourId];
                                 return (react_1.default.createElement("tr", { key: projectHourId, className: hasError ? 'bg-red-50' : '' },
                                     react_1.default.createElement("td", { className: "border border-gray-300 px-4 py-2" }, formatDate(task.date)),
                                     react_1.default.createElement("td", { className: "border border-gray-300 px-4 py-2" }, task.description),
                                     react_1.default.createElement("td", { className: "border border-gray-300 px-4 py-2" }, section.disputeType === 'Hourly'
                                         ? originalHours.toFixed(2)
-                                        : `$${((_b = section.disputeAmount) === null || _b === void 0 ? void 0 : _b.toFixed(2)) || '0.00'}`),
+                                        : `$${((_c = section.disputeAmount) === null || _c === void 0 ? void 0 : _c.toFixed(2)) || '0.00'}`),
                                     react_1.default.createElement("td", { className: "border border-gray-300 px-4 py-2" },
                                         react_1.default.createElement("div", null,
-                                            section.disputeType === 'Hourly' ? (react_1.default.createElement("input", { type: "number", step: "0.01", min: "0", max: originalHours, value: newHours, onChange: (e) => handleHourChange(projectHourId, e.target.value), className: `w-full px-2 py-1 border rounded focus:outline-none focus:ring-2 focus:ring-blue-500 ${hasError ? 'border-red-500' : 'border-gray-300'}` })) : (react_1.default.createElement("div", { className: "flex items-center" },
+                                            section.disputeType === 'Hourly' ? (react_1.default.createElement("input", { type: "number", step: "1", max: originalHours, value: newHours !== undefined && newHours >= 0 ? newHours : '', onChange: (e) => handleHourChange(projectHourId, e.target.value), className: `w-full px-2 py-1 border rounded focus:outline-none focus:ring-2 focus:ring-blue-500 ${hasError ? 'border-red-500' : 'border-gray-300'}` })) : (react_1.default.createElement("div", { className: "flex items-center" },
                                                 react_1.default.createElement("span", { className: "mr-1" }, "$"),
-                                                react_1.default.createElement("span", null, newAmount.toFixed(2)),
-                                                react_1.default.createElement("input", { type: "number", step: "0.01", min: "0", max: originalHours, value: newHours, onChange: (e) => handleHourChange(projectHourId, e.target.value), className: `ml-2 w-20 px-2 py-1 border rounded focus:outline-none focus:ring-2 focus:ring-blue-500 ${hasError ? 'border-red-500' : 'border-gray-300'}`, placeholder: "hrs" }),
-                                                react_1.default.createElement("span", { className: "ml-1 text-xs text-gray-500" }, "hrs"))),
+                                                react_1.default.createElement("input", { type: "number", step: "1", min: "0", max: originalAmount, value: newAmount !== undefined && newAmount >= 0 ? newAmount : '', onChange: (e) => handleAmountChange(projectHourId, (e.target.value).toString()), className: `w-32 px-2 py-1 border rounded focus:outline-none focus:ring-2 focus:ring-blue-500 ${hasError ? 'border-red-500' : 'border-gray-300'}`, placeholder: "$0.00" }))),
                                             hasError && (react_1.default.createElement("div", { className: "text-red-500 text-xs mt-1" }, hasError))))));
                             }))))));
             })),

package/lib/components/Invoices/TestDecisionSection.d.ts CHANGED Viewed

	@@ -1 +1 @@
1	- export declare const TestDecisionSection: () => JSX.Element;
1	+ export declare const TestDecisionSection: () => JSX.Element;

package/lib/components/Invoices/TestDecisionSection.js CHANGED Viewed

@@ -1,126 +1,126 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TestDecisionSection = void 0;
-const react_1 = __importDefault(require("react"));
-const DecisionSection_1 = require("./DecisionSection");
-// Test data from the provided JSON
-const testDispute = {
-    "__typename": "ClientInvoiceDispute",
-    "disputeId": 35,
-    "approvedAmount": 450,
-    "chatEnabled": true,
-    "disputeDate": "2025-05-22",
-    "disputeUpdatedDate": "2025-05-23",
-    "freelancerId": 8081,
-    "freelancer": {
-        "__typename": "User",
-        "id": 8081,
-        "email": "andpande@gmail.com",
-        "firstName": "William",
-        "lastName": "Annon"
-    },
-    "status": "Resolved",
-    "finalDecisionOwnerId": 29005,
-    "invoice": {
-        "__typename": "ClientInvoice",
-        "amount": 450,
-        "balanceDue": 450,
-        "clientId": 4433,
-        "dateGenerated": "2025-04-14",
-        "id": 175325,
-        "month": "2025-04-01"
-    },
-    "disputeProjects": [
-        {
-            "__typename": "ClientInvoiceDisputeProject",
-            "id": 37,
-            "projectId": 19158,
-            "disputeAmount": 450,
-            "disputeHours": 30,
-            "disputeType": "Hourly",
-            "disputeReasonCode": "Incorrect Hours Logged",
-            "clientExplanation": "I have a dispute over this expert for the current invoice 175325",
-            "clientDocumentLinks": "https://expert-client-dispute-files.s3.amazonaws.com/project-19158%2Ftesting.pdf,https://expert-client-dispute-files.s3.amazonaws.com/project-19158%2F_Carmelita_Resume-Graduation__1_.docx",
-            "expertDocumentLinks": "https://expert-client-dispute-files.s3.amazonaws.com/project-19158%2F0eb4b31b-b6d8-4cd1-b6ac-39b807ea4577.pdf",
-            "resolutionMode": null,
-            "resolutionType": null,
-            "project": {
-                "__typename": "Project",
-                "name": "Ongoing Ad-Hoc Support",
-                "freelancerRate": null,
-                "clientRate": null,
-                "projectHours": [
-                    {
-                        "__typename": "ProjectHour",
-                        "id": 136605,
-                        "date": "2022-02-11",
-                        "description": "Ate Tacos",
-                        "hours": 8
-                    },
-                    {
-                        "__typename": "ProjectHour",
-                        "id": 136606,
-                        "date": "2022-02-12",
-                        "description": "Worked on project analysis",
-                        "hours": 6
-                    },
-                    {
-                        "__typename": "ProjectHour",
-                        "id": 136607,
-                        "date": "2022-02-13",
-                        "description": "Client meeting and documentation",
-                        "hours": 4
-                    },
-                    {
-                        "__typename": "ProjectHour",
-                        "id": 136608,
-                        "date": "2022-02-14",
-                        "description": "Code review and testing",
-                        "hours": 7
-                    },
-                    {
-                        "__typename": "ProjectHour",
-                        "id": 136609,
-                        "date": "2022-02-15",
-                        "description": "Final deliverable preparation",
-                        "hours": 5
-                    }
-                ]
-            }
-        }
-    ],
-    "lastMessageAt": "2025-05-23T10:56:53.000Z",
-    "messageCount": 5,
-    "client": {
-        "__typename": "Client",
-        "name": "Vessel Advisors"
-    }
-};
-const testUser = {
-    userId: 29005,
-    firstName: "Test",
-    lastName: "User"
-};
-const TestDecisionSection = () => {
-    const mockOnUpdateDispute = (variables) => __awaiter(void 0, void 0, void 0, function* () {
-        console.log('Mock update dispute called with:', variables);
-        return Promise.resolve({ success: true });
-    });
-    const mockUpdateInvoiceMutation = {};
-    return (react_1.default.createElement("div", { className: "p-8 max-w-4xl mx-auto" },
-        react_1.default.createElement("h1", { className: "text-2xl font-bold mb-6" }, "Test Decision Section with Hours Modal"),
-        react_1.default.createElement(DecisionSection_1.DecisionSection, { dispute: testDispute, onUpdateDispute: mockOnUpdateDispute, updateInvoiceMutation: mockUpdateInvoiceMutation, user: testUser })));
-};
-exports.TestDecisionSection = TestDecisionSection;
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestDecisionSection = void 0;
+const react_1 = __importDefault(require("react"));
+const DecisionSection_1 = require("./DecisionSection");
+// Test data from the provided JSON
+const testDispute = {
+    "__typename": "ClientInvoiceDispute",
+    "disputeId": 35,
+    "approvedAmount": 450,
+    "chatEnabled": true,
+    "disputeDate": "2025-05-22",
+    "disputeUpdatedDate": "2025-05-23",
+    "freelancerId": 8081,
+    "freelancer": {
+        "__typename": "User",
+        "id": 8081,
+        "email": "andpande@gmail.com",
+        "firstName": "William",
+        "lastName": "Annon"
+    },
+    "status": "Resolved",
+    "finalDecisionOwnerId": 29005,
+    "invoice": {
+        "__typename": "ClientInvoice",
+        "amount": 450,
+        "balanceDue": 450,
+        "clientId": 4433,
+        "dateGenerated": "2025-04-14",
+        "id": 175325,
+        "month": "2025-04-01"
+    },
+    "disputeProjects": [
+        {
+            "__typename": "ClientInvoiceDisputeProject",
+            "id": 37,
+            "projectId": 19158,
+            "disputeAmount": 450,
+            "disputeHours": 30,
+            "disputeType": "Hourly",
+            "disputeReasonCode": "Incorrect Hours Logged",
+            "clientExplanation": "I have a dispute over this expert for the current invoice 175325",
+            "clientDocumentLinks": "https://expert-client-dispute-files.s3.amazonaws.com/project-19158%2Ftesting.pdf,https://expert-client-dispute-files.s3.amazonaws.com/project-19158%2F_Carmelita_Resume-Graduation__1_.docx",
+            "expertDocumentLinks": "https://expert-client-dispute-files.s3.amazonaws.com/project-19158%2F0eb4b31b-b6d8-4cd1-b6ac-39b807ea4577.pdf",
+            "resolutionMode": null,
+            "resolutionType": null,
+            "project": {
+                "__typename": "Project",
+                "name": "Ongoing Ad-Hoc Support",
+                "freelancerRate": null,
+                "clientRate": null,
+                "projectHours": [
+                    {
+                        "__typename": "ProjectHour",
+                        "id": 136605,
+                        "date": "2022-02-11",
+                        "description": "Ate Tacos",
+                        "hours": 8
+                    },
+                    {
+                        "__typename": "ProjectHour",
+                        "id": 136606,
+                        "date": "2022-02-12",
+                        "description": "Worked on project analysis",
+                        "hours": 6
+                    },
+                    {
+                        "__typename": "ProjectHour",
+                        "id": 136607,
+                        "date": "2022-02-13",
+                        "description": "Client meeting and documentation",
+                        "hours": 4
+                    },
+                    {
+                        "__typename": "ProjectHour",
+                        "id": 136608,
+                        "date": "2022-02-14",
+                        "description": "Code review and testing",
+                        "hours": 7
+                    },
+                    {
+                        "__typename": "ProjectHour",
+                        "id": 136609,
+                        "date": "2022-02-15",
+                        "description": "Final deliverable preparation",
+                        "hours": 5
+                    }
+                ]
+            }
+        }
+    ],
+    "lastMessageAt": "2025-05-23T10:56:53.000Z",
+    "messageCount": 5,
+    "client": {
+        "__typename": "Client",
+        "name": "Vessel Advisors"
+    }
+};
+const testUser = {
+    userId: 29005,
+    firstName: "Test",
+    lastName: "User"
+};
+const TestDecisionSection = () => {
+    const mockOnUpdateDispute = (variables) => __awaiter(void 0, void 0, void 0, function* () {
+        console.log('Mock update dispute called with:', variables);
+        return Promise.resolve({ success: true });
+    });
+    const mockUpdateInvoiceMutation = {};
+    return (react_1.default.createElement("div", { className: "p-8 max-w-4xl mx-auto" },
+        react_1.default.createElement("h1", { className: "text-2xl font-bold mb-6" }, "Test Decision Section with Hours Modal"),
+        react_1.default.createElement(DecisionSection_1.DecisionSection, { dispute: testDispute, onUpdateDispute: mockOnUpdateDispute, updateInvoiceMutation: mockUpdateInvoiceMutation, user: testUser })));
+};
+exports.TestDecisionSection = TestDecisionSection;