diff --git a/src/components/JoinedGroupCard.tsx b/src/components/JoinedGroupCard.tsx index 6f65e47..4ac522a 100644 --- a/src/components/JoinedGroupCard.tsx +++ b/src/components/JoinedGroupCard.tsx @@ -103,7 +103,7 @@ export const JoinedGroupCard: FC = ({ item }:any) => { Duration - {`${item?.cycleType} (${item?.customCycleDays} days)`} + { item?.cycleType === 'CUSTOM' ? `${item?.cycleType} (${item?.customCycleDays} days)` : item?.cycleType} @@ -145,7 +145,7 @@ export const JoinedGroupCard: FC = ({ item }:any) => { ✓ PAID ) : ( - item.status !== 'COMPLETED' && ( + (item.status !== 'COMPLETED' || item?.status === "ACTIVE" || item?.status === "DELAY") && ( {