Merge remote-tracking branch 'origin/main'

backend/src/app.ts

@@ -1019,7 +1019,7 @@ const parseDataImage = (dataUrl: string) => {
 };
 
 const getDefaultBirdPhotoAttachment = () => {
-  const defaultPhotoPath = path.join(process.cwd(), 'assets', 'yoda.png');
+  const defaultPhotoPath = path.join(process.cwd(), 'assets', 'yoda-default.png');
 
   if (!existsSync(defaultPhotoPath)) {
     console.warn(`Unable to load default bird photo from ${defaultPhotoPath}`);
@@ -1027,7 +1027,7 @@ const getDefaultBirdPhotoAttachment = () => {
   }
 
   return {
-    filename: 'yoda.png',
+    filename: 'yoda-default.png',
     path: defaultPhotoPath,
     cid: 'flockpal-default-bird-photo',
     contentDisposition: 'inline' as const,

frontend/src/App.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useState } from 'react';
 import flockPalLandingArt from './assets/flockpal-landing-art.png';
-import defaultBirdPhoto from './assets/yoda.png';
+import defaultBirdPhoto from './assets/yoda-default.png';
 import { findParrotWeightReference, parrotSpeciesOptions, type ParrotWeightReference } from './parrotWeightReference';
 
 type BillingPlan = 'rescue_free' | 'household_basic' | 'household_plus' | 'household_macaw';