Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
Merge branch 'main' into 380/upgradeBtn
Marc Seitz759cd789ddcb
diff --cc pages/settings/agreements.tsxindex 3b7cf20a,bcde377c..8313eeab--- a/pages/settings/agreements.tsx+++ b/pages/settings/agreements.tsx@@@ -1,4 -1,4 +1,4 @@@--import { useEffect, useMemo, useState } from "react";++import { useMemo, useState } from "react";import { useTeam } from "@/context/team-context";import { PlanEnum } from "@/ee/stripe/constants";@@@ -14,20 -15,11 +14,19 @@@ import AgreementSheet from "@/componentimport { SettingsHeader } from "@/components/settings/settings-header";import { Button } from "@/components/ui/button";import { BadgeTooltip } from "@/components/ui/tooltip";+import { createUpgradeButton } from "@/components/ui/upgrade-button";+-+const AgreementsUpgradeButton = createUpgradeButton(+ "Create Agreements",+ PlanEnum.Business,+ "nda_agreements_page",+ { highlightItem: ["nda"] },+);+export default function NdaAgreements() {const { agreements, loading, error } = useAgreements();const teamInfo = useTeam();- const { isBusiness, isDatarooms, isDataroomsPlus } = usePlan();- const [showUpgradeModal, setShowUpgradeModal] = useState(false);- const { isBusiness, isDatarooms, isDataroomsPlus, isTrial } = usePlan();++ const { isTrial, isBusiness, isDatarooms, isDataroomsPlus } = usePlan();const [isOpen, setIsOpen] = useState<boolean>(false);diff --cc pages/settings/people.tsxindex 34f6c816,4a1fd189..735353dd--- a/pages/settings/people.tsx+++ b/pages/settings/people.tsx@@@ -30,7 -32,7 +31,8 @@@ importDropdownMenuTrigger,} from "@/components/ui/dropdown-menu";import { Skeleton } from "@/components/ui/skeleton";+import { UpgradeButton } from "@/components/ui/upgrade-button";+export default function Billing() {const [isTeamMemberInviteModalOpen, setTeamMemberInviteModalOpen] =useState<boolean>(false);@@@ -80,7 -83,7 +83,11 @@@);};- const changeRole = async (teamId: string, userId: string, role: string) => {- const changeRole = async (teamId: string, userId: string, role: "ADMIN" | "MANAGER" | "MEMBER") => {++ const changeRole = async (++ teamId: string,++ userId: string,++ role: "ADMIN" | "MANAGER" | "MEMBER",++ ) => {const response = await fetch(`/api/teams/${teamId}/change-role`, {method: "PUT",headers: {@@@ -238,11 -241,14 +245,11 @@@</p></div>{showUpgradePlanModal ? (- <UpgradePlanModal+ <UpgradeButton+ text="Invite Members"- clickedPlan={PlanEnum.Pro}+ clickedPlan={isTrial ? PlanEnum.Business : PlanEnum.Pro}- trigger={"invite_team_members"}- >- <Button className="whitespace-nowrap px-1 text-xs sm:px-4 sm:text-sm">- Upgrade to invite members- </Button>- </UpgradePlanModal>+ trigger="invite_team_members"+ />) : showInvite ? (<AddTeamMembersopen={isTeamMemberInviteModalOpen}diff --cc pages/settings/webhooks/new.tsxindex 6a782e73,82d0c618..00d82b44--- a/pages/settings/webhooks/new.tsx+++ b/pages/settings/webhooks/new.tsx@@@ -13,7 -13,7 +13,6 @@@ import { z } from "zod"import { newId } from "@/lib/id-helper";import { usePlan } from "@/lib/swr/use-billing";--import { UpgradePlanModal } from "@/components/billing/upgrade-plan-modal";import AppLayout from "@/components/layouts/app";import { SettingsHeader } from "@/components/settings/settings-header";import Copy from "@/components/shared/icons/copy";@@@ -338,9 -337,9 +337,9 @@@ export default function NewWebhook()</div><div className="flex space-x-4">- {isFree || isPro ? (+ {(isFree || isPro) && !isTrial ? (- <UpgradePlanModal- key="create-webhook"+ <UpgradeButton+ text="Save Webhook"clickedPlan={PlanEnum.Business}trigger="create_webhook"highlightItem={["webhooks"]}