Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
chore: Profile menu improvements (#5596)
Oleg Isonen8e02c86e5f92
diff --git a/apps/builder/app/dashboard/profile-menu.tsx b/apps/builder/app/dashboard/profile-menu.tsxindex 0f5bdcc486..1bae92d58f 100644--- a/apps/builder/app/dashboard/profile-menu.tsx+++ b/apps/builder/app/dashboard/profile-menu.tsx@@ -29,9 +29,9 @@ const ProfileButton = forwardRef<{name: string;image?: string;- badge?: string;+ hasPurchases?: boolean;}->(({ image, name, badge, ...rest }, forwardedRef) => {+>(({ image, name, hasPurchases, ...rest }, forwardedRef) => {return (<Buttoncolor="ghost"@@ -47,7 +47,7 @@ const ProfileButton = forwardRef<height: theme.spacing[13],}}>- {badge && <ProBadge>{badge}</ProBadge>}+ {hasPurchases === false && <ProBadge>Free</ProBadge>}</Button>);});@@ -62,33 +62,39 @@ export const ProfileMenu = ({const navigate = useNavigate();const nameOrEmail = user.username ?? user.email ?? defaultUserName;const hasPaidPlan = userPlanFeatures.purchases.length > 0;- const latestPlanName = userPlanFeatures.purchases[0]?.planName;+ const subscriptions = userPlanFeatures.purchases.filter((purchase) =>+ Boolean(purchase.subscriptionId)+ );return (<DropdownMenu><DropdownMenuTrigger asChild><ProfileButtonimage={user.image || undefined}name={nameOrEmail}- badge={latestPlanName}+ hasPurchases={hasPaidPlan}/></DropdownMenuTrigger>- <DropdownMenuContent align="start">+ <DropdownMenuContent align="start" width="regular"><DropdownMenuLabel>{user.username ?? defaultUserName}<Text>{user.email}</Text></DropdownMenuLabel>- {userPlanFeatures.purchases- .filter((purchase) => Boolean(purchase.subscriptionId))- .map((purchase) => (- <DropdownMenuItem- key={purchase.subscriptionId}- onSelect={() =>- navigate(userPlanSubscriptionPath(purchase.subscriptionId))- }- >- Manage {purchase.planName}- </DropdownMenuItem>- ))}+ {subscriptions.length > 0 && (+ <>+ <DropdownMenuSeparator />+ <DropdownMenuLabel>Purchases</DropdownMenuLabel>+ </>+ )}+ {subscriptions.map((purchase) => (+ <DropdownMenuItem+ key={purchase.subscriptionId}+ onSelect={() =>+ navigate(userPlanSubscriptionPath(purchase.subscriptionId))+ }+ >+ {purchase.planName}+ </DropdownMenuItem>+ ))}{hasPaidPlan === false && (<DropdownMenuItemonSelect={() => {@@ -97,7 +103,7 @@ export const ProfileMenu = ({css={{ gap: theme.spacing[3] }}><UpgradeIcon />- <div>Upgrade to Pro</div>+ <div>Upgrade</div></DropdownMenuItem>)}<DropdownMenuSeparator />