Merge pull request #586 from mfts/fix/bulk-download

fix: dataroom folder rename

components/documents/folder-card.tsx

@@ -251,7 +251,13 @@ export default function FolderCard({
             </DropdownMenuTrigger>
             <DropdownMenuContent align="end" ref={dropdownRef}>
               <DropdownMenuLabel>Actions</DropdownMenuLabel>
-              <DropdownMenuItem onClick={() => setOpenFolder(true)}>
+              <DropdownMenuItem
+                onClick={(e) => {
+                  e.preventDefault();
+                  e.stopPropagation();
+                  setOpenFolder(true);
+                }}
+              >
                 Rename
               </DropdownMenuItem>
               {!isDataroom ? (

components/folders/add-folder-modal.tsx

@@ -46,7 +46,7 @@ export function AddFolderModal({
   const [open, setOpen] = useState<boolean>(false);
 
   const teamInfo = useTeam();
-  const { plan } = usePlan();
+  const { plan, trial } = usePlan();
   const analytics = useAnalytics();
 
   /** current folder name */
@@ -107,7 +107,7 @@ export function AddFolderModal({
   };
 
   // If the team is on a free plan, show the upgrade modal
-  if (plan === "free") {
+  if (plan === "free" && (!isDataroom || !trial)) {
     if (children) {
       return (
         <UpgradePlanModal clickedPlan="Pro" trigger={"add_folder_button"}>