diff --git a/src/front/Components/DesignSystem/BlockList/index.tsx b/src/front/Components/DesignSystem/BlockList/index.tsx index 2081f9d1..ddf1cbb9 100644 --- a/src/front/Components/DesignSystem/BlockList/index.tsx +++ b/src/front/Components/DesignSystem/BlockList/index.tsx @@ -24,6 +24,7 @@ export default function BlockList({ blocks, onSelectedBlock }: IProps) { }, [blocks, onSelectedBlock], ); + return (
{blocks.map((folder) => { @@ -35,8 +36,8 @@ export default function BlockList({ blocks, onSelectedBlock }: IProps) {
{folder.hasFlag && } + {folder.rightIcon} chevron - {folder.rightIcon && folder.rightIcon}
diff --git a/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/CollaboratorListContainer/index.tsx b/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/CollaboratorListContainer/index.tsx index 3b93c202..7cc30bb4 100644 --- a/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/CollaboratorListContainer/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/CollaboratorListContainer/index.tsx @@ -53,6 +53,18 @@ export default function CollaboratorListContainer(props: IProps) { name: user.contact?.first_name + " " + user.contact?.last_name, id: user.uid!, selected: user.uid === collaboratorUid, + rightIcon: user.seats?.some((seat) => new Date(seat.subscription!.end_date) >= new Date()) ? ( +
+ ) : ( + <> + ), }; })} onSelectedBlock={onSelectedBlock} diff --git a/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/index.tsx b/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/index.tsx index 9147e5e7..ca531f0b 100644 --- a/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/index.tsx @@ -103,7 +103,6 @@ export default class DefaultCollaboratorDashboard extends React.Component
{userSelected?.contact?.first_name + " " + userSelected?.contact?.last_name} + {userSelected && userSelected.seats?.some((seat) => new Date(seat.subscription!.end_date) >= new Date()) && ( +
+
+ + Abonnement actif + +
+ )}
diff --git a/src/front/Components/Layouts/Subscription/SubscriptionFacturation/index.tsx b/src/front/Components/Layouts/Subscription/SubscriptionFacturation/index.tsx index d0a225aa..cb0238c8 100644 --- a/src/front/Components/Layouts/Subscription/SubscriptionFacturation/index.tsx +++ b/src/front/Components/Layouts/Subscription/SubscriptionFacturation/index.tsx @@ -81,7 +81,6 @@ export default function SubscriptionFacturation() { loadSubscription(); }, [loadSubscription]); - console.log(forfeitsPrices[EForfeitType.unlimited].toString()); return ( {subscription && (