Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refactor Signup component and update InviteMemberDialog for clarity

Bill Yang7ab94c784315
diff --git a/client/src/app/invitation/components/signup.tsx b/client/src/app/invitation/components/signup.tsx
index 0c89af395..8571190e5 100644
--- a/client/src/app/invitation/components/signup.tsx
+++ b/client/src/app/invitation/components/signup.tsx
@@ -71,14 +71,6 @@ export function Signup({ inviterEmail, organization }: SignupProps) {
return (
<form onSubmit={handleSignup}>
<div className="flex flex-col gap-4">
- <AuthButton
- isLoading={isLoading}
- loadingText="Creating account..."
- disabled={IS_CLOUD ? !turnstileToken || isLoading : isLoading}
- >
- Sign Up to Accept Invitation
- </AuthButton>
-
<SocialButtons onError={setError} />
<AuthInput
@@ -101,6 +93,14 @@ export function Signup({ inviterEmail, organization }: SignupProps) {
onChange={e => setPassword(e.target.value)}
/>
+ <AuthButton
+ isLoading={isLoading}
+ loadingText="Creating account..."
+ disabled={IS_CLOUD ? !turnstileToken || isLoading : isLoading}
+ >
+ Sign Up to Accept Invitation
+ </AuthButton>
+
{IS_CLOUD && (
<Turnstile
onSuccess={token => setTurnstileToken(token)}
diff --git a/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx b/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx
index dd29f6b6e..5427002cc 100644
--- a/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx
+++ b/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx
@@ -93,7 +93,8 @@ export function InviteMemberDialog({ organizationId, onSuccess, memberCount }: I
</span>
</TooltipTrigger>
<TooltipContent>
- You have reached the limit of {subscription?.isPro ? 10 : 3} members. Upgrade to add more members
+ You have reached the limit of {getMemberLimit(subscription)} member
+ {getMemberLimit(subscription) > 1 ? "s" : ""}. Upgrade to add more members
</TooltipContent>
</Tooltip>
);