Remove invoice interstitial modal #1505

MayaRainer · 2025-11-05T16:35:52Z

Closes #1502.

Removes the interstitial modal when clicking on an invoice row, instead taking the user to the invoice page directly.

Before

Screencast_20251105_173455.webm

After

Screencast_20251105_182918.webm

MayaRainer

@slavingia / @laugardie lmkwyt! test failures are on main as well

MayaRainer · 2025-11-05T17:14:27Z

e2e/tests/company/invoices/list.spec.ts

-    await invoiceRow.click();
-
-    await expect(page.getByRole("dialog")).toBeVisible();
+    await page.getByRole("row").filter({ hasText: "Awaiting approval" }).click();


Just simplified this a little bit.

MayaRainer · 2025-11-05T17:15:03Z

e2e/tests/company/invoices/list.spec.ts

-    await page.getByRole("row").getByText("Awaiting approval").first().click();
+    await page.getByRole("row").filter({ hasText: "Awaiting approval" }).click();

+    await expect(page.getByRole("heading", { name: "INV-123456" })).toBeVisible();


Asserting that the new page is visible rather than a modal.

MayaRainer · 2025-11-05T17:31:21Z

frontend/app/(dashboard)/invoices/page.tsx

    }
  };

+  const [rowSelection, setRowSelection] = useState<Record<string, boolean>>(() => {


To preserve the row selection when coming back from the detail page.

MayaRainer · 2025-11-05T20:08:48Z

e2e/tests/company/invoices/one-off-payments.spec.ts

      await login(page, preOnboardingUser, `/invoices/${invoice.externalId}`);
      await expect(page.getByText("Missing tax information.")).toBeVisible();
-      await page.getByRole("link", { name: "Invoices" }).click();
+      await page.getByRole("link", { name: "Invoices", exact: true }).click();


To disambiguate from the "Back to invoices" link

laugardie · 2025-11-06T11:55:35Z

We could probably remove “View invoice” from the contextual menu since the row is now clickable to open it.

Also, when testing on mobile, I am not able to navigate to the invoice page.

Screen.Recording.2025-11-06.at.11.52.07.mov

MayaRainer

@laugardie _a Thanks! Could you have another look please?

laugardie · 2025-11-07T09:32:22Z

@MayaRainer _a looks good to me!

MayaRainer · 2025-11-07T13:07:38Z

@laugardie Thanks!
@slavingia _a lmk if this is good to merge!

…titial

MayaRainer

Added the new invoice totals UI - @ershad @laugardie lmkwyt!

Before

After

MayaRainer · 2025-11-29T21:17:41Z

e2e/tests/company/invoices/complete-flow.spec.ts

    await page.getByPlaceholder("Description").first().fill("first item updated");
    await fillByLabel(page, "Hours / Qty", "04:30", { index: 0 });
    await expect(page.getByText("$870", { exact: true })).toBeVisible();
-    await Promise.all([


These checks were unnecessary and making the test flaky.

MayaRainer · 2025-11-29T21:18:52Z

frontend/app/(dashboard)/invoices/Edit.tsx

-                </div>
-              ) : null}
-              {company.equityEnabled ? (
+            <Totals


Made a component to share between the edit and show page as they're so similar now.

laugardie · 2025-12-03T11:46:14Z

@MayaRainer just pushed some small UI changes. Rest looks good to me!

I have one small concern regarding the UX when editing the equity (not strictly an issue with this PR, but related). If a contractor adds line items to a new invoice and then realizes they need to update the payment split, clicking that link navigates them away and they lose all the data they just entered. Even if open on a new tab, we need to reload to get the updated equity split.
I'm thinking maybe we could just save the form progress temporarily? Keep the info while the invoice hasn't been sent, and then clear it out once they successfully hit send? @ershad

…titial

…xile into remove-invoice-interstitial

MayaRainer

maybe we could just save the form progress temporarily

Makes sense to me! Happy to make that change in a follow-up if we want to.

@ershad Good to merge?

MayaRainer · 2025-12-10T00:01:03Z

playwright.config.ts

  },
  expect: { timeout: 30000, toPass: { timeout: 30000 } },
-  timeout: process.env.CI ? 30000 : 120000,
+  timeout: process.env.CI ? 60000 : 120000,


Increased this to 60s as the complete-flow spec is just so long that it sometimes can't complete within 30s. The expect timeout remains 30s, so any actually failing assertions will still fail after 30s.

ershad

@MayaRainer _a added a couple of comments, lgtm otherwise 👍🏼

ershad · 2025-12-16T23:31:43Z

frontend/app/(dashboard)/invoices/[id]/page.tsx

+                  expensesTotal={invoice.expenses.reduce((acc, expense) => acc + expense.totalAmountInCents, BigInt(0))}
+                  equityAmountInCents={invoice.equityAmountInCents}
+                  equityNotice={
+                    invoice.equityAmountInCents > 0 ? (


@MayaRainer just checked with @slavingia, for companies that have equity enabled, can we display the equity split and percentage even if it's 0?

ershad · 2025-12-16T23:33:23Z

frontend/app/(dashboard)/invoices/Edit.tsx

+                      for company equity.
+                    </span>{" "}
+                    <Link href="/settings/payouts" className={linkClasses}>
+                      Edit


Can we hide the link until we have a system to either save progress or automatically update the invoice numbers when the split is updated in settings?

MayaRainer

@ershad _a Thanks! Done and done, could you have another look please? Test failures look unrelated.

MayaRainer · 2025-12-24T23:30:37Z

@ershad Gentle bump on this when you have a moment :)

ershad

@MayaRainer added one comment, lgtm otherwise 👍🏼

Wasn't able to test with an equity invoice since the seed data doesn't include it. But it should be okay since tests cover that.

ershad · 2025-12-26T19:47:02Z

frontend/app/(dashboard)/invoices/[id]/page.tsx

                        </PrintTableHeader>
                        <PrintTableHeader className="w-[20%] text-right md:w-[15%] print:text-right">
-                          Cash rate
+                          Rate


Could you make this Rate on web and Cash rate on print view?

MayaRainer added 4 commits November 5, 2025 17:32

Remove invoice interstitial modal

4a8d7f7

fix

a7f0320

fix

368ba80

fix

ca7aa83

MayaRainer marked this pull request as ready for review November 5, 2025 19:55

MayaRainer commented Nov 5, 2025

View reviewed changes

fix

ceeeef5

MayaRainer commented Nov 6, 2025

View reviewed changes

neetogit-bot bot assigned laugardie Nov 6, 2025

neetogit-bot bot assigned MayaRainer and unassigned laugardie Nov 7, 2025

neetogit-bot bot assigned slavingia and unassigned MayaRainer Nov 7, 2025

MayaRainer added 10 commits November 23, 2025 16:16

Merge remote-tracking branch 'origin/main' into remove-invoice-inters…

d26a414

…titial

fix

1a4fdee

fix

619203a

fix

f5c81b8

fix

d0fc0e4

fix

07eb755

fix

33cf711

fix

bb15b1e

fix

f6fe4dd

fix

3517f52

MayaRainer commented Nov 29, 2025

View reviewed changes

ui

496ea6d

Merge remote-tracking branch 'origin/main' into remove-invoice-inters…

397ec78

…titial

MayaRainer added 2 commits December 9, 2025 14:33

Merge branch 'remove-invoice-interstitial' of github.com:antiwork/fle…

43c624c

…xile into remove-invoice-interstitial

fix

a4fe48a

MayaRainer commented Dec 10, 2025

View reviewed changes

ershad reviewed Dec 16, 2025

View reviewed changes

neetogit-bot bot assigned MayaRainer and unassigned slavingia Dec 16, 2025

fix

5549663

MayaRainer commented Dec 19, 2025

View reviewed changes

neetogit-bot bot assigned ershad and unassigned MayaRainer Dec 19, 2025

Merge branch 'main' into remove-invoice-interstitial

9e015ae

Merge branch 'main' into remove-invoice-interstitial

f3f251b

ershad approved these changes Dec 26, 2025

View reviewed changes

fix

e6c5b14

MayaRainer merged commit c5f4dbb into main Dec 26, 2025
3 of 4 checks passed

MayaRainer deleted the remove-invoice-interstitial branch December 26, 2025 21:45

Remove invoice interstitial modal #1505

Remove invoice interstitial modal #1505

Uh oh!

Conversation

MayaRainer commented Nov 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MayaRainer left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

laugardie commented Nov 6, 2025

Uh oh!

MayaRainer left a comment

Choose a reason for hiding this comment

Uh oh!

laugardie commented Nov 7, 2025

Uh oh!

MayaRainer commented Nov 7, 2025

Uh oh!

MayaRainer left a comment

Choose a reason for hiding this comment

Before

After

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

laugardie commented Dec 3, 2025

Uh oh!

MayaRainer left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ershad left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MayaRainer left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MayaRainer commented Dec 24, 2025

Uh oh!

ershad left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

MayaRainer commented Nov 5, 2025 •

edited

Loading

MayaRainer left a comment •

edited

Loading