Merge remote-tracking branch 'origin/dev' into dev

src/app/(main)/reports/ReportDeleteButton.tsx

@@ -30,7 +30,7 @@ export function ReportDeleteButton({
 
   return (
     <ModalTrigger>
-      <Button variant="quiet">
+      <Button>
         <Icon>
           <Icons.Trash />
         </Icon>

src/app/(main)/settings/teams/TeamsHeader.tsx

@@ -8,11 +8,12 @@ import TeamsAddButton from './TeamsAddButton';
 export function TeamsHeader({ allowCreate = true }: { allowCreate?: boolean }) {
   const { formatMessage, labels } = useMessages();
   const { user } = useLogin();
+  const cloudMode = !!process.env.cloudMode;
 
   return (
     <PageHeader title={formatMessage(labels.teams)}>
       <Flexbox gap={10}>
-        <TeamsJoinButton />
+        {!cloudMode && <TeamsJoinButton />}
         {allowCreate && user.role !== ROLES.viewOnly && <TeamsAddButton />}
       </Flexbox>
     </PageHeader>

src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditButton.tsx

@@ -25,7 +25,7 @@ export function TeamMemberEditButton({
 
   return (
     <ModalTrigger>
-      <Button variant="quiet">
+      <Button>
         <Icon>
           <Icons.Edit />
         </Icon>

src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditForm.tsx

@@ -11,7 +11,7 @@ import {
   SubmitButton,
 } from 'react-basics';
 
-export function UserAddForm({
+export function TeamMemberEditForm({
   teamId,
   userId,
   role,
@@ -41,7 +41,7 @@ export function UserAddForm({
 
   const renderValue = (value: string) => {
     if (value === ROLES.teamMember) {
-      return formatMessage(labels.teamMember);
+      return formatMessage(labels.member);
     }
     if (value === ROLES.teamViewOnly) {
       return formatMessage(labels.viewOnly);
@@ -58,7 +58,7 @@ export function UserAddForm({
               minWidth: '250px',
             }}
           >
-            <Item key={ROLES.teamMember}>{formatMessage(labels.teamMember)}</Item>
+            <Item key={ROLES.teamMember}>{formatMessage(labels.member)}</Item>
             <Item key={ROLES.teamViewOnly}>{formatMessage(labels.viewOnly)}</Item>
           </Dropdown>
         </FormInput>
@@ -75,4 +75,4 @@ export function UserAddForm({
   );
 }
 
-export default UserAddForm;
+export default TeamMemberEditForm;

src/app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton.tsx

@@ -35,7 +35,7 @@ export function TeamMemberRemoveButton({
 
   return (
     <ModalTrigger>
-      <Button variant="quiet">
+      <Button>
         <Icon>
           <Icons.Close />
         </Icon>

src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx

@@ -36,7 +36,7 @@ export function TeamMembersTable({
           return (
             allowEdit &&
             row?.role !== ROLES.teamOwner &&
-            user?.id !== row?.id && (
+            user?.id !== row?.user?.id && (
               <>
                 <TeamMemberEditButton teamId={teamId} userId={row?.user?.id} role={row?.role} />
                 <TeamMemberRemoveButton

src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx

@@ -26,6 +26,7 @@ export function TeamEditForm({ teamId, allowEdit }: { teamId: string; allowEdit?
   const ref = useRef(null);
   const [accessCode, setAccessCode] = useState(team.accessCode);
   const { showToast } = useToasts();
+  const cloudMode = !!process.env.cloudMode;
 
   const handleSubmit = async (data: any) => {
     mutate(data, {
@@ -58,7 +59,7 @@ export function TeamEditForm({ teamId, allowEdit }: { teamId: string; allowEdit?
         )}
         {!allowEdit && team.name}
       </FormRow>
-      {allowEdit && (
+      {!cloudMode && allowEdit && (
         <FormRow label={formatMessage(labels.accessCode)}>
           <Flexbox gap={10}>
             <TextField value={accessCode} readOnly allowCopy />

src/components/messages.ts

@@ -28,6 +28,7 @@ export const labels = defineMessages({
   created: { id: 'label.created', defaultMessage: 'Created' },
   edit: { id: 'label.edit', defaultMessage: 'Edit' },
   name: { id: 'label.name', defaultMessage: 'Name' },
+  member: { id: 'label.member', defaultMessage: 'Member' },
   members: { id: 'label.members', defaultMessage: 'Members' },
   accessCode: { id: 'label.access-code', defaultMessage: 'Access code' },
   teamId: { id: 'label.team-id', defaultMessage: 'Team ID' },