Merge branch 'dev'
This commit is contained in:
commit
8205fee420
7 files changed
+9
-32
No files matched your search
+1
-5
@@ -657,7 +657,6 @@ const normalizeBird = (row: BirdRow) => ({
|
||||
publicProfileEnabled: row.public_profile_enabled ?? false,
|
||||
memorializedAt: row.memorialized_at,
|
||||
memorializedOn: row.memorialized_on,
|
||||
memorialNote: row.memorial_note,
|
||||
notifyOnMemorialDay: row.notify_on_memorial_day,
|
||||
createdAt: row.created_at,
|
||||
latestWeightGrams: row.latest_weight_grams ? Number(row.latest_weight_grams) : null,
|
||||
@@ -1712,9 +1711,7 @@ const buildBirdMilestoneReminderCopy = (reminder: BirdMilestoneReminderCandidate
|
||||
yearCount > 0
|
||||
? `From our flock to yours, holding ${reminder.name}'s memory close on this ${formatOrdinal(yearCount)} memorial day.`
|
||||
: `From our flock to yours, holding ${reminder.name}'s memory close today.`,
|
||||
body: reminder.memorial_note
|
||||
? reminder.memorial_note
|
||||
: 'A quiet moment for the feathers, songs, routines, and happy memories that still stay with you.',
|
||||
body: 'A quiet moment for the feathers, songs, routines, and happy memories that still stay with you.',
|
||||
milestoneLabel: yearCount > 0 ? `${formatOrdinal(yearCount)} Memorial Day` : 'Memorial Day on file',
|
||||
};
|
||||
}
|
||||
@@ -4015,7 +4012,6 @@ app.post('/api/birds/:birdId/memorialize', requireAuth, requireWriteAccess, requ
|
||||
birdId: req.params.birdId,
|
||||
workspaceId: req.auth!.workspace.id,
|
||||
memorializedOn: parsed.data.memorializedOn,
|
||||
memorialNote: emptyToNull(parsed.data.memorialNote),
|
||||
notifyOnMemorialDay: parsed.data.notifyOnMemorialDay ?? false,
|
||||
});
|
||||
|
||||
|
||||
Reference in new issue
Block a user