diff --git a/auto-bid-server/src/modules/mails/services/mails.service.ts b/auto-bid-server/src/modules/mails/services/mails.service.ts index 9e2a27c..e5f35f5 100644 --- a/auto-bid-server/src/modules/mails/services/mails.service.ts +++ b/auto-bid-server/src/modules/mails/services/mails.service.ts @@ -102,11 +102,18 @@ export class MailsService { }); // Separate hot and non-hot items, preserving original order - const hotItemsFirst = [ - ...decorated.filter((p) => p.isHotItem), - ...decorated.filter((p) => !p.isHotItem), + const hotItemsList = decorated.filter((p) => p.isHotItem); + const nonHotItems = decorated.filter((p) => !p.isHotItem); + + // Đưa các item mới (isNew) lên đầu trong nhóm không phải hot item + const sortedNonHotItems = [ + ...nonHotItems.filter((p) => p.isNew), + ...nonHotItems.filter((p) => !p.isNew), ]; + // Separate hot and non-hot items, preserving original order + const hotItemsFirst = [...hotItemsList, ...sortedNonHotItems]; + const rows = hotItemsFirst .map((p) => { const isHotItem = isHotItemFn(p, hotItems); @@ -125,7 +132,7 @@ export class MailsService { return `