Skip to content

Commit 2c9ba50

Browse files
Fix/add members (#339)
* Refactor AddMembers button composition and trigger * Fix save value on submit * Fixes * Removed groupDetailQuery ternary check
1 parent d6a7d37 commit 2c9ba50

File tree

4 files changed

+21
-19
lines changed

4 files changed

+21
-19
lines changed

src/components/Account/UpdateName.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export const UpdateName: React.FC<{
7777
actionOnClick={handleOnActionClick}
7878
>
7979
<Form {...detailForm}>
80-
<form className="mt-4 flex w-full items-start gap-4">
80+
<form className="mt-4 flex w-full items-start gap-4" onSubmit={handleOnActionClick}>
8181
<FormField control={detailForm.control} name="name" render={field} />
8282
</form>
8383
</Form>

src/components/group/AddMembers.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { Input } from '../ui/input';
1515

1616
const AddMembers: React.FC<{
1717
enableSendingInvites: boolean;
18-
group: Group & { groupUsers: GroupUser[] };
18+
group: (Group & { groupUsers: GroupUser[] }) | null | undefined;
1919
children: React.ReactNode;
2020
}> = ({ group, children, enableSendingInvites }) => {
2121
const { t } = useTranslation('groups_details');
@@ -29,6 +29,10 @@ const AddMembers: React.FC<{
2929

3030
const utils = api.useUtils();
3131

32+
if (!group) {
33+
return null;
34+
}
35+
3236
const groupUserMap = group.groupUsers.reduce(
3337
(acc, gu) => {
3438
acc[gu.userId] = true;
@@ -103,7 +107,7 @@ const AddMembers: React.FC<{
103107

104108
return (
105109
<AppDrawer
106-
trigger={<>{children}</>}
110+
trigger={children}
107111
onTriggerClick={handleTriggerClick}
108112
title={t('ui.no_members.add_members_details.title')}
109113
leftAction={t('ui.actions.cancel', { ns: 'common' })}

src/components/group/NoMembers.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ const NoMembers: React.FC<NoMembersProps> = ({ group, enableSendingInvites }) =>
2929
return (
3030
<div className="flex h-full flex-col items-center justify-center gap-4">
3131
<p className="mb-4 text-center text-gray-500">{t('ui.no_members.no_members')}</p>
32-
<Button className="w-[200px]" disabled={isArchived}>
33-
<AddMembers group={group} enableSendingInvites={enableSendingInvites}>
34-
<UserPlus className="text-primary-foreground h-5 w-5" />
35-
<p>{t('ui.no_members.add_members')}</p>
36-
</AddMembers>
37-
</Button>
32+
33+
<AddMembers group={group} enableSendingInvites={enableSendingInvites}>
34+
<Button className="w-[200px]" disabled={isArchived}>
35+
<UserPlus className="text-primary-foreground" /> {t('ui.no_members.add_members')}
36+
</Button>
37+
</AddMembers>
38+
3839
<p className="text-gray-400">{t('common:ui.or')}</p>
3940
<Button
4041
className="flex w-[200px] items-center gap-2"

src/pages/groups/[groupId].tsx

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -425,16 +425,13 @@ const BalancePage: NextPageWithUser<{
425425
<PlusIcon className="size-4" /> {t('ui.actions.add_expense', { ns: 'common' })}
426426
</Button>
427427
</Link>
428-
<Button size="sm" responsiveIcon variant="secondary" disabled={isArchived}>
429-
{groupDetailQuery.data ? (
430-
<AddMembers
431-
group={groupDetailQuery.data}
432-
enableSendingInvites={enableSendingInvites}
433-
>
434-
<UserPlus className="size-4 text-gray-400" /> {t('ui.add_members')}
435-
</AddMembers>
436-
) : null}
437-
</Button>
428+
429+
<AddMembers group={groupDetailQuery.data} enableSendingInvites={enableSendingInvites}>
430+
<Button size="sm" responsiveIcon variant="secondary" disabled={isArchived}>
431+
<UserPlus className="size-4 text-gray-400" /> {t('ui.add_members')}
432+
</Button>
433+
</AddMembers>
434+
438435
<Button
439436
size="sm"
440437
responsiveIcon

0 commit comments

Comments
 (0)