Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
Merge branch 'main' into yearly-switch
Marc Seitz38dee8d63ecc
diff --cc components/billing/upgrade-plan-container.tsxindex 88e61dfe,1a8e0be7..fa8151c8--- a/components/billing/upgrade-plan-container.tsx+++ b/components/billing/upgrade-plan-container.tsx@@@ -201,26 -204,8 +204,8 @@@ export default function UpgradePlanContclickedPlan={PlanEnum.Business}trigger="upgrade_plan"useModal={false}- onClick={() => router.push("/settings/upgrade")}+ onClick={() => router.push("/settings/upgrade-holiday-offer")}/>- {isCustomer && (- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Button variant="outline" size="sm" className="h-9 w-9 p-0">- <MoreVertical className="h-4 w-4" />- <span className="sr-only">More options</span>- </Button>- </DropdownMenuTrigger>- <DropdownMenuContent align="end">- <DropdownMenuItem- onClick={() => manageSubscription({ type: "invoices" })}- >- <ReceiptTextIcon className="h-4 w-4" />- View invoices- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- )}</div>);} else if (isCancelled) {diff --cc components/sidebar/app-sidebar.tsxindex f89d97e1,5b25987f..b9ddd72d--- a/components/sidebar/app-sidebar.tsx+++ b/components/sidebar/app-sidebar.tsx@@@ -40,8 -41,10 +41,9 @@@ importSidebarMenuItem,} from "@/components/ui/sidebar";-import ProAnnualBanner from "../billing/pro-annual-banner";import ProBanner from "../billing/pro-banner";import { Progress } from "../ui/progress";+ import { BadgeTooltip } from "../ui/tooltip";import SlackBanner from "./banners/slack-banner";export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {diff --cc components/visitors/visitors-table.tsxindex b64a6ab7,e48e0b19..6405e0d4--- a/components/visitors/visitors-table.tsx+++ b/components/visitors/visitors-table.tsx@@@ -156,6 -158,57 +158,57 @@@ export default function VisitorsTable(</TableCell></TableRow>)}+ {views?.hiddenViewCount! > 0 && (+ <>+ <TableRow className="">+ <TableCell colSpan={5} className="text-left sm:text-center">+ {isPaused &&+ views?.hiddenFromPause &&+ views.hiddenFromPause > 0 ? (+ // Show pause-specific message if team is paused and has hidden views from pause+ <div className="flex flex-col items-start justify-center gap-2 sm:flex-row sm:items-center">+ <span className="flex items-center gap-x-1">+ <AlertTriangleIcon className="inline-block h-4 w-4 text-orange-500" />+ {views.hiddenFromPause} visit+ {views.hiddenFromPause !== 1 ? "s" : ""} occurred+ after your team was paused and{" "}+ {views.hiddenFromPause !== 1 ? "are" : "is"}{" "}+ hidden.{" "}+ </span>+ <Link+ href="/settings/billing"+ className="font-medium text-orange-600 underline hover:text-orange-700"+ >+ Unpause subscription to see all visits+ </Link>+ </div>+ ) : (+ // Show regular free plan message+ <div className="flex flex-col items-start justify-center gap-1 sm:flex-row sm:items-center">+ <span className="flex items-center gap-x-1">+ <AlertTriangleIcon className="inline-block h-4 w-4 text-yellow-500" />+ Some older visits may not be shown because your+ document has more than 20 views.{" "}+ </span>- <UpgradePlanModal++ <UpgradePlanModalWithDiscount+ clickedPlan={+ isTrial ? PlanEnum.Business : PlanEnum.Pro+ }+ trigger=""+ >+ <button className="underline hover:text-gray-800">+ Upgrade to see full history+ </button>- </UpgradePlanModal>++ </UpgradePlanModalWithDiscount>+ </div>+ )}+ </TableCell>+ </TableRow>+ {Array.from({ length: views?.hiddenViewCount! }).map((_, i) => (+ <VisitorBlurred key={i} />+ ))}+ </>+ )}{views?.viewsWithDuration ? (views.viewsWithDuration.map((view) => {if (view.isArchived) {