Free & Open-Source Invoice Generator - No Sign-Up, No Ads, Instant PDF Export, 100% In-Browser, and Fully Customizable Templates.
TypeScript fintechinvoiceinvoice-generatorinvoice-pdfinvoice-templateinvoicesnextjsopen-sourcequotesreactreact-pdf-rendererself-hostedshadcn-uitailwindcsstypescript
refactor: remove button helpers from general information section (#204)
Vlad Sazonaua77a28405f1d
diff --git a/e2e/invoice-form.test.ts b/e2e/invoice-form.test.tsindex 67e2208..ed96d9b 100644--- a/e2e/invoice-form.test.ts+++ b/e2e/invoice-form.test.ts@@ -1390,12 +1390,6 @@ test.describe("Invoice Generator Page", () => {generalInfoSection.getByText("Date of issue is not today"),).toBeVisible();- const dateOfIssueBtn = generalInfoSection.getByRole("button", {- name: "Set date of issue to today (2025-12-01)",- });- await expect(dateOfIssueBtn).toBeVisible();- await expect(dateOfIssueBtn).toBeEnabled();-// Set date of service to a date that's not the last day of current monthconst dateOfServiceInput = generalInfoSection.getByLabel("Date of Service");await dateOfServiceInput.fill("2024-01-20");@@ -1407,12 +1401,6 @@ test.describe("Invoice Generator Page", () => {),).toBeVisible();- const dateOfServiceBtn = generalInfoSection.getByRole("button", {- name: "Set date of service to month end (2025-12-31)",- });- await expect(dateOfServiceBtn).toBeVisible();- await expect(dateOfServiceBtn).toBeEnabled();-// Set invoice number to an old month to trigger stale stateconst invoiceNumberInput = generalInfoSection.getByLabel("Value");await invoiceNumberInput.fill("1/01-2024");@@ -1424,12 +1412,6 @@ test.describe("Invoice Generator Page", () => {),).toBeVisible();- const invoiceNumberBtn = generalInfoSection.getByRole("button", {- name: "Set invoice number to current month (1/12-2025)",- });- await expect(invoiceNumberBtn).toBeVisible();- await expect(invoiceNumberBtn).toBeEnabled();-// Set payment due to a stale date (date of issue + 1 day instead of + 14 days)const paymentDueInput = page.getByLabel("Payment Due");await paymentDueInput.fill("2024-01-16");diff --git a/src/app/(app)/components/invoice-form/common.tsx b/src/app/(app)/components/invoice-form/common.tsxindex f8522bc..b8cc800 100644--- a/src/app/(app)/components/invoice-form/common.tsx+++ b/src/app/(app)/components/invoice-form/common.tsx@@ -5,5 +5,7 @@ export const ErrorMessage = ({ children }: { children: React.ReactNode }) => {};export const AlertIcon = () => {- return <AlertTriangle className="mr-1 inline-block h-3 w-3 text-amber-500" />;+ return (+ <AlertTriangle className="mr-1 inline-block size-3.5 shrink-0 text-amber-500" />+ );};diff --git a/src/app/(app)/components/invoice-form/sections/general-information.tsx b/src/app/(app)/components/invoice-form/sections/general-information.tsxindex ea6d1ff..bac71d5 100644--- a/src/app/(app)/components/invoice-form/sections/general-information.tsx+++ b/src/app/(app)/components/invoice-form/sections/general-information.tsx@@ -1,3 +1,7 @@+import {+ AlertIcon,+ ErrorMessage,+} from "@/app/(app)/components/invoice-form/common";import { INVOICE_PDF_TRANSLATIONS } from "@/app/(app)/pdf-i18n-translations/pdf-translations";import {DEFAULT_DATE_FORMAT,@@ -31,36 +35,8 @@ import {} from "react-hook-form";import { toast } from "sonner";-const AlertIcon = () => {- return (- <AlertTriangle className="mr-1 inline-block size-3.5 shrink-0 text-amber-500" />- );-};--const ErrorMessage = ({ children }: { children: React.ReactNode }) => {- return <p className="mt-1 text-xs text-red-600">{children}</p>;-};-const CURRENT_MONTH_AND_YEAR = dayjs().format("MM-YYYY");-// Logo helper functions-const validateImageSize = (file: File): Promise<boolean> => {- return new Promise((resolve) => {- const maxSize = 3 * 1024 * 1024; // 3MB in bytes-- resolve(file.size <= maxSize);- });-};--const convertFileToBase64 = (file: File): Promise<string> => {- return new Promise((resolve, reject) => {- const reader = new FileReader();- reader.onload = () => resolve(reader.result as string);- reader.onerror = reject;- reader.readAsDataURL(file);- });-};-interface GeneralInformationProps {control: Control<InvoiceData>;errors: FieldErrors<InvoiceData>;@@ -455,22 +431,6 @@ export const GeneralInformation = memo(function GeneralInformation({<AlertIcon />Invoice number does not match current month</span>-- <ButtonHelper- onClick={() => {- setValue(- "invoiceNumberObject.value",- `1/${CURRENT_MONTH_AND_YEAR}`,- );- }}- >- <span className="text-pretty">- Set invoice number to{" "}- <span className="font-bold">- current month ({`1/${CURRENT_MONTH_AND_YEAR}`})- </span>- </span>- </ButtonHelper></InputHelperMessage>)}</div>@@ -516,32 +476,6 @@ export const GeneralInformation = memo(function GeneralInformation({<AlertIcon />Date of issue is not today</span>-- <ButtonHelper- onClick={() => {- const currentMonth = dayjs().format("YYYY-MM-DD"); // default browser date input format is YYYY-MM-DD-- setValue("dateOfIssue", currentMonth);-- // Automatically update payment due date to 14 days after the new date of issue for better UX- setValue(- "paymentDue",- dayjs(currentMonth).add(14, "days").format("YYYY-MM-DD"),- );- }}- >- <span className="text-pretty">- Set date of issue to{" "}- <span className="font-bold">- today ({dayjs().format(selectedDateFormat)})- </span>{" "}- and update payment due to{" "}- <span className="font-bold">- +14 days (- {dayjs().add(14, "days").format(selectedDateFormat)})- </span>- </span>- </ButtonHelper></InputHelperMessage>) : null}</div>@@ -568,28 +502,11 @@ export const GeneralInformation = memo(function GeneralInformation({<AlertIcon />Date of service is not the last day of the current month</span>-- <ButtonHelper- onClick={() => {- const lastDayOfCurrentMonth = dayjs()- .endOf("month")- .format("YYYY-MM-DD"); // default browser date input format is YYYY-MM-DD-- setValue("dateOfService", lastDayOfCurrentMonth);- }}- >- <span className="text-pretty">- Set date of service to{" "}- <span className="font-bold">- month end (- {dayjs().endOf("month").format(selectedDateFormat)})- </span>- </span>- </ButtonHelper></InputHelperMessage>) : null}</div>+ {/* Out of Date Dates Helper */}{canShowOutOfDateDatesHelper ? (<OutOfDateDatesHelperdateOfIssue={dateOfIssue}@@ -924,3 +841,21 @@ function OutOfDateDatesHelper({</div>);}++// Logo helper functions+const validateImageSize = (file: File): Promise<boolean> => {+ return new Promise((resolve) => {+ const maxSize = 3 * 1024 * 1024; // 3MB in bytes++ resolve(file.size <= maxSize);+ });+};++const convertFileToBase64 = (file: File): Promise<string> => {+ return new Promise((resolve, reject) => {+ const reader = new FileReader();+ reader.onload = () => resolve(reader.result as string);+ reader.onerror = reject;+ reader.readAsDataURL(file);+ });+};