diff --git a/src/components/Collections/CollectionListBar/CollectionCard.tsx b/src/components/Collections/CollectionListBar/CollectionCard.tsx
index 2ffcdeddd..d5630b07a 100644
--- a/src/components/Collections/CollectionListBar/CollectionCard.tsx
+++ b/src/components/Collections/CollectionListBar/CollectionCard.tsx
@@ -58,7 +58,12 @@ function CollectionCardIcon({ collectionType }) {
})}
/>
)}
- {collectionType === CollectionSummaryType.shared && }
+ {collectionType === CollectionSummaryType.outgoingShare && (
+
+ )}
+ {collectionType === CollectionSummaryType.incomingShare && (
+
+ )}
{collectionType === CollectionSummaryType.sharedOnlyViaLink && (
)}
diff --git a/src/components/Collections/CollectionOptions/index.tsx b/src/components/Collections/CollectionOptions/index.tsx
index c58ab1645..01f4190e4 100644
--- a/src/components/Collections/CollectionOptions/index.tsx
+++ b/src/components/Collections/CollectionOptions/index.tsx
@@ -244,7 +244,8 @@ const CollectionOptions = (props: CollectionOptionsProps) => {
- ) : collectionSummaryType === CollectionSummaryType.shared ? (
+ ) : collectionSummaryType ===
+ CollectionSummaryType.incomingShare ? (
diff --git a/src/components/PhotoList.tsx b/src/components/PhotoList.tsx
index 0fc6779d5..29105226a 100644
--- a/src/components/PhotoList.tsx
+++ b/src/components/PhotoList.tsx
@@ -563,11 +563,14 @@ export function PhotoList({
switch (listItem.itemType) {
case ITEM_TYPE.TIME:
return listItem.dates ? (
- listItem.dates.map((item) => (
-
- {item.date}
-
- ))
+ listItem.dates
+ .map((item) => [
+
+ {item.date}
+ ,
+
,
+ ])
+ .flat()
) : (
{listItem.date}
diff --git a/src/constants/collection/index.ts b/src/constants/collection/index.ts
index 8b93013e9..4cfa8643c 100644
--- a/src/constants/collection/index.ts
+++ b/src/constants/collection/index.ts
@@ -15,7 +15,8 @@ export enum CollectionSummaryType {
archive = 'archive',
trash = 'trash',
all = 'all',
- shared = 'shared',
+ outgoingShare = 'outgoingShare',
+ incomingShare = 'incomingShare',
sharedOnlyViaLink = 'sharedOnlyViaLink',
archived = 'archived',
}
@@ -34,7 +35,8 @@ export const COLLECTION_SORT_ORDER = new Map([
[CollectionSummaryType.favorites, 1],
[CollectionSummaryType.album, 2],
[CollectionSummaryType.folder, 2],
- [CollectionSummaryType.shared, 2],
+ [CollectionSummaryType.incomingShare, 2],
+ [CollectionSummaryType.outgoingShare, 2],
[CollectionSummaryType.sharedOnlyViaLink, 2],
[CollectionSummaryType.archived, 2],
[CollectionSummaryType.archive, 3],
@@ -50,7 +52,8 @@ export const SYSTEM_COLLECTION_TYPES = new Set([
export const UPLOAD_NOT_ALLOWED_COLLECTION_TYPES = new Set([
CollectionSummaryType.all,
CollectionSummaryType.archive,
- CollectionSummaryType.shared,
+ CollectionSummaryType.incomingShare,
+ CollectionSummaryType.outgoingShare,
CollectionSummaryType.sharedOnlyViaLink,
CollectionSummaryType.trash,
]);
diff --git a/src/services/collectionService.ts b/src/services/collectionService.ts
index 64db064b9..78c5ba3ad 100644
--- a/src/services/collectionService.ts
+++ b/src/services/collectionService.ts
@@ -827,14 +827,15 @@ export function getCollectionSummaries(
latestFile: collectionLatestFiles.get(collection.id),
fileCount: collectionFilesCount.get(collection.id),
updationTime: collection.updationTime,
- type:
- isSharedWithMe(collection, user) || isSharedByMe(collection)
- ? CollectionSummaryType.shared
- : isSharedOnlyViaLink(collection)
- ? CollectionSummaryType.sharedOnlyViaLink
- : IsArchived(collection)
- ? CollectionSummaryType.archived
- : CollectionSummaryType[collection.type],
+ type: isSharedWithMe(collection, user)
+ ? CollectionSummaryType.incomingShare
+ : isSharedByMe(collection)
+ ? CollectionSummaryType.outgoingShare
+ : isSharedOnlyViaLink(collection)
+ ? CollectionSummaryType.sharedOnlyViaLink
+ : IsArchived(collection)
+ ? CollectionSummaryType.archived
+ : CollectionSummaryType[collection.type],
});
}
}