Merge branch 'dev' into jajaja

2025-03-08 07:25:40 -08:00
parent b4be6cb221 abde966647
commit b331da193f
27 changed files with 217 additions and 50 deletions
--- a/src/app/(main)/teams/[teamId]/settings/members/TeamMemberRemoveButton.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/members/TeamMemberRemoveButton.tsx
@@ -45,7 +45,7 @@ export function TeamMemberRemoveButton({
          {({ close }) => (
            <ConfirmationForm
              message={formatMessage(messages.confirmRemove, {
-                target: <b key="username">{userName}</b>,
+                target: <b key={messages.confirmRemove.id}>{userName}</b>,
              })}
              isLoading={isPending}
              error={error}