From a78da16790f63a9eb5c06d869c8693950d36a45e Mon Sep 17 00:00:00 2001
From: Giancarlo Buomprisco <giancarlopsk@gmail.com>
Date: Fri, 28 Nov 2025 08:42:33 +0800
Subject: [PATCH] 2.21.5 (#417)

* refactor: streamline sign-in and sign-up methods containers for improved conditional rendering

- Updated SignInMethodsContainer and SignUpMethodsContainer to conditionally render the separator and "or continue with" text only when applicable authentication methods are available.
- Enhanced code readability by removing redundant div elements and improving the structure of conditional rendering.

* refactor: enhance UI components with improved styling and structure

- Updated PlanIntervalSwitcher to include hover effects and adjusted button size for better user interaction.
- Refined PersonalAccountDropdown by removing unnecessary animation classes for cleaner code.
- Modified Footer component to standardize padding across different screen sizes.
- Adjusted Pill component's height and padding for a more consistent appearance.

* refactor: enhance admin members and memberships tables with date rendering and sorting adjustments

- Removed User ID column from both AdminMembersTable and AdminMembershipsTable for a cleaner interface.
- Added date rendering functionality for Created At and Updated At columns, displaying time in a user-friendly format.
- Disabled sorting for Name, Email, Role, Created At, and Updated At columns to improve usability.

* fix: update account linking messages and redirect logic

- Changed the success message for account linking to indicate that a request has been sent and to prompt the user to wait.
- Added a redirect path to the PersonalAccountSettingsContainer for improved navigation after account linking.
- Removed the unused useUnlinkIdentity hook to clean up the codebase.
---
 apps/web/public/locales/en/account.json       |  2 +-
 .../gateway/src/components/pricing-table.tsx  |  9 +++++--
 .../components/personal-account-dropdown.tsx  |  4 +--
 .../account-settings-container.tsx            |  1 +
 .../src/components/admin-members-table.tsx    | 19 +++++++++++---
 .../components/admin-memberships-table.tsx    | 18 ++++++++++---
 .../components/sign-in-methods-container.tsx  | 26 ++++++++++++-------
 .../components/sign-up-methods-container.tsx  | 26 ++++++++++++-------
 .../supabase/src/hooks/use-unlink-identity.ts | 22 ----------------
 packages/ui/src/makerkit/marketing/footer.tsx |  2 +-
 packages/ui/src/makerkit/marketing/pill.tsx   |  4 +--
 11 files changed, 77 insertions(+), 56 deletions(-)
 delete mode 100644 packages/supabase/src/hooks/use-unlink-identity.ts

diff --git a/apps/web/public/locales/en/account.json b/apps/web/public/locales/en/account.json
index ca67e24df..c1a5e7dfe 100644
--- a/apps/web/public/locales/en/account.json
+++ b/apps/web/public/locales/en/account.json
@@ -123,7 +123,7 @@
   "linkEmailPasswordSuccess": "Email and password linked",
   "linkEmailPasswordError": "Failed to link email and password",
   "linkingAccount": "Linking account...",
-  "accountLinked": "Account linked",
+  "accountLinked": "Account linking request sent. Please wait...",
   "unlinkAccount": "Unlink Account",
   "failedToLinkAccount": "Failed to link account",
   "availableMethods": "Available Methods",
diff --git a/packages/billing/gateway/src/components/pricing-table.tsx b/packages/billing/gateway/src/components/pricing-table.tsx
index e64d27172..c227ce829 100644
--- a/packages/billing/gateway/src/components/pricing-table.tsx
+++ b/packages/billing/gateway/src/components/pricing-table.tsx
@@ -417,7 +417,11 @@ function PlanIntervalSwitcher(
   }>,
 ) {
   return (
-    <div className={'flex gap-x-1 rounded-full border'}>
+    <div
+      className={
+        'hover:border-border flex gap-x-1 rounded-full border border-transparent transition-colors'
+      }
+    >
       {props.intervals.map((plan, index) => {
         const selected = plan === props.interval;
 
@@ -434,13 +438,14 @@ function PlanIntervalSwitcher(
         return (
           <Button
             key={plan}
+            size={'sm'}
             variant={selected ? 'secondary' : 'ghost'}
             className={className}
             onClick={() => props.setInterval(plan)}
           >
             <span className={'flex items-center'}>
               <CheckCircle
-                className={cn('animate-in fade-in zoom-in-95 h-3.5', {
+                className={cn('animate-in fade-in zoom-in-95 h-3', {
                   hidden: !selected,
                   'slide-in-from-left-4': index === 0,
                   'slide-in-from-right-4': index === props.intervals.length - 1,
diff --git a/packages/features/accounts/src/components/personal-account-dropdown.tsx b/packages/features/accounts/src/components/personal-account-dropdown.tsx
index 28ba21867..6dc1acd01 100644
--- a/packages/features/accounts/src/components/personal-account-dropdown.tsx
+++ b/packages/features/accounts/src/components/personal-account-dropdown.tsx
@@ -87,7 +87,7 @@ export function PersonalAccountDropdown({
         aria-label="Open your profile menu"
         data-test={'account-dropdown-trigger'}
         className={cn(
-          'animate-in group/trigger fade-in focus:outline-primary flex cursor-pointer items-center group-data-[minimized=true]/sidebar:px-0',
+          'group/trigger fade-in focus:outline-primary flex cursor-pointer items-center group-data-[minimized=true]/sidebar:px-0',
           className ?? '',
           {
             ['active:bg-secondary/50 items-center gap-4 rounded-md' +
@@ -108,7 +108,7 @@ export function PersonalAccountDropdown({
         <If condition={showProfileName}>
           <div
             className={
-              'fade-in animate-in flex w-full flex-col truncate text-left group-data-[minimized=true]/sidebar:hidden'
+              'fade-in flex w-full flex-col truncate text-left group-data-[minimized=true]/sidebar:hidden'
             }
           >
             <span
diff --git a/packages/features/accounts/src/components/personal-account-settings/account-settings-container.tsx b/packages/features/accounts/src/components/personal-account-settings/account-settings-container.tsx
index cbb42ad3d..052abbeec 100644
--- a/packages/features/accounts/src/components/personal-account-settings/account-settings-container.tsx
+++ b/packages/features/accounts/src/components/personal-account-settings/account-settings-container.tsx
@@ -174,6 +174,7 @@ export function PersonalAccountSettingsContainer(
             enabled={props.features.enableAccountLinking}
             showEmailOption={props.features.showLinkEmailOption}
             showPasswordOption={props.features.enablePasswordUpdate}
+            redirectTo={'/home/settings'}
           />
         </CardContent>
       </Card>
diff --git a/packages/features/admin/src/components/admin-members-table.tsx b/packages/features/admin/src/components/admin-members-table.tsx
index d00e51c37..8637f281c 100644
--- a/packages/features/admin/src/components/admin-members-table.tsx
+++ b/packages/features/admin/src/components/admin-members-table.tsx
@@ -17,12 +17,9 @@ export function AdminMembersTable(props: { members: Memberships[] }) {
 
 function getColumns(): ColumnDef<Memberships>[] {
   return [
-    {
-      header: 'User ID',
-      accessorKey: 'user_id',
-    },
     {
       header: 'Name',
+      enableSorting: false,
       cell: ({ row }) => {
         const name = row.original.name ?? row.original.email;
 
@@ -48,9 +45,11 @@ function getColumns(): ColumnDef<Memberships>[] {
     {
       header: 'Email',
       accessorKey: 'email',
+      enableSorting: false,
     },
     {
       header: 'Role',
+      enableSorting: false,
       cell: ({ row }) => {
         return row.original.role;
       },
@@ -58,10 +57,22 @@ function getColumns(): ColumnDef<Memberships>[] {
     {
       header: 'Created At',
       accessorKey: 'created_at',
+      enableSorting: false,
+      cell: ({ row }) => {
+        return renderDate(row.original.created_at);
+      },
     },
     {
       header: 'Updated At',
       accessorKey: 'updated_at',
+      enableSorting: false,
+      cell: ({ row }) => {
+        return renderDate(row.original.updated_at);
+      },
     },
   ];
 }
+
+function renderDate(date: string) {
+  return <span className={'text-xs'}>{new Date(date).toTimeString()}</span>;
+}
diff --git a/packages/features/admin/src/components/admin-memberships-table.tsx b/packages/features/admin/src/components/admin-memberships-table.tsx
index a9ea2c350..cbf2a126c 100644
--- a/packages/features/admin/src/components/admin-memberships-table.tsx
+++ b/packages/features/admin/src/components/admin-memberships-table.tsx
@@ -20,12 +20,9 @@ export function AdminMembershipsTable(props: { memberships: Membership[] }) {
 
 function getColumns(): ColumnDef<Membership>[] {
   return [
-    {
-      header: 'User ID',
-      accessorKey: 'user_id',
-    },
     {
       header: 'Team',
+      enableSorting: false,
       cell: ({ row }) => {
         return (
           <Link
@@ -40,14 +37,27 @@ function getColumns(): ColumnDef<Membership>[] {
     {
       header: 'Role',
       accessorKey: 'account_role',
+      enableSorting: false,
     },
     {
       header: 'Created At',
       accessorKey: 'created_at',
+      enableSorting: false,
+      cell: ({ row }) => {
+        return renderDate(row.original.created_at);
+      },
     },
     {
       header: 'Updated At',
       accessorKey: 'updated_at',
+      enableSorting: false,
+      cell: ({ row }) => {
+        return renderDate(row.original.updated_at);
+      },
     },
   ];
 }
+
+function renderDate(date: string) {
+  return <span className={'text-xs'}>{new Date(date).toTimeString()}</span>;
+}
diff --git a/packages/features/auth/src/components/sign-in-methods-container.tsx b/packages/features/auth/src/components/sign-in-methods-container.tsx
index 7ed64241b..b738e9be3 100644
--- a/packages/features/auth/src/components/sign-in-methods-container.tsx
+++ b/packages/features/auth/src/components/sign-in-methods-container.tsx
@@ -72,17 +72,25 @@ export function SignInMethodsContainer(props: {
       </If>
 
       <If condition={props.providers.oAuth.length}>
-        <div className="relative">
-          <div className="absolute inset-0 flex items-center">
-            <Separator />
-          </div>
+        <If
+          condition={
+            props.providers.magicLink ||
+            props.providers.password ||
+            props.providers.otp
+          }
+        >
+          <div className="relative">
+            <div className="absolute inset-0 flex items-center">
+              <Separator />
+            </div>
 
-          <div className="relative flex justify-center text-xs uppercase">
-            <span className="bg-background text-muted-foreground px-2">
-              <Trans i18nKey="auth:orContinueWith" />
-            </span>
+            <div className="relative flex justify-center text-xs uppercase">
+              <span className="bg-background text-muted-foreground px-2">
+                <Trans i18nKey="auth:orContinueWith" />
+              </span>
+            </div>
           </div>
-        </div>
+        </If>
 
         <OauthProviders
           enabledProviders={props.providers.oAuth}
diff --git a/packages/features/auth/src/components/sign-up-methods-container.tsx b/packages/features/auth/src/components/sign-up-methods-container.tsx
index 266d20f88..f73caaaca 100644
--- a/packages/features/auth/src/components/sign-up-methods-container.tsx
+++ b/packages/features/auth/src/components/sign-up-methods-container.tsx
@@ -64,17 +64,25 @@ export function SignUpMethodsContainer(props: {
       </If>
 
       <If condition={props.providers.oAuth.length}>
-        <div className="relative">
-          <div className="absolute inset-0 flex items-center">
-            <Separator />
-          </div>
+        <If
+          condition={
+            props.providers.magicLink ||
+            props.providers.password ||
+            props.providers.otp
+          }
+        >
+          <div className="relative">
+            <div className="absolute inset-0 flex items-center">
+              <Separator />
+            </div>
 
-          <div className="relative flex justify-center text-xs uppercase">
-            <span className="bg-background text-muted-foreground px-2">
-              <Trans i18nKey="auth:orContinueWith" />
-            </span>
+            <div className="relative flex justify-center text-xs uppercase">
+              <span className="bg-background text-muted-foreground px-2">
+                <Trans i18nKey="auth:orContinueWith" />
+              </span>
+            </div>
           </div>
-        </div>
+        </If>
 
         <OauthProviders
           enabledProviders={props.providers.oAuth}
diff --git a/packages/supabase/src/hooks/use-unlink-identity.ts b/packages/supabase/src/hooks/use-unlink-identity.ts
deleted file mode 100644
index e579f6c85..000000000
--- a/packages/supabase/src/hooks/use-unlink-identity.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { UserIdentity } from '@supabase/supabase-js';
-
-import { useMutation } from '@tanstack/react-query';
-
-import { useSupabase } from './use-supabase';
-
-export function useUnlinkIdentity() {
-  const client = useSupabase();
-  const mutationKey = ['auth', 'unlink-identity'];
-
-  const mutationFn = async (identity: UserIdentity) => {
-    const { error } = await client.auth.unlinkIdentity(identity);
-
-    if (error) {
-      throw error.message ?? error;
-    }
-
-    await client.auth.refreshSession();
-  };
-
-  return useMutation({ mutationKey, mutationFn });
-}
diff --git a/packages/ui/src/makerkit/marketing/footer.tsx b/packages/ui/src/makerkit/marketing/footer.tsx
index e202728d9..9ac5ba698 100644
--- a/packages/ui/src/makerkit/marketing/footer.tsx
+++ b/packages/ui/src/makerkit/marketing/footer.tsx
@@ -26,7 +26,7 @@ export const Footer: React.FC<FooterProps> = ({
   return (
     <footer
       className={cn(
-        'site-footer bg-muted/20 relative mt-auto w-full py-8 2xl:py-20',
+        'site-footer bg-muted/20 relative mt-auto w-full py-8 xl:py-16 2xl:py-20',
         className,
       )}
       {...props}
diff --git a/packages/ui/src/makerkit/marketing/pill.tsx b/packages/ui/src/makerkit/marketing/pill.tsx
index 60685502c..d69532588 100644
--- a/packages/ui/src/makerkit/marketing/pill.tsx
+++ b/packages/ui/src/makerkit/marketing/pill.tsx
@@ -14,7 +14,7 @@ export const Pill: React.FC<
   return (
     <Comp
       className={cn(
-        'bg-muted/50 flex min-h-10 items-center gap-x-1.5 rounded-full border px-2 py-1 text-center text-sm font-medium text-transparent',
+        'flex min-h-9 items-center gap-x-1.5 rounded-full border px-1.5 py-1 text-center text-sm font-medium text-transparent',
         className,
       )}
       {...props}
@@ -22,7 +22,7 @@ export const Pill: React.FC<
       {props.label && (
         <span
           className={
-            'text-primary-foreground bg-primary rounded-2xl border px-1.5 py-0.5 text-xs font-bold tracking-tight'
+            'text-primary-foreground bg-primary rounded-2xl border px-1.5 py-1.5 text-xs font-bold tracking-tight'
           }
         >
           {props.label}