Merge branch 'master' into marathon-v2

frontend/src/types/index.ts

@@ -273,6 +273,7 @@ export interface Assignment {
   completed_at: string | null
   drop_penalty: number
   bonus_challenges?: BonusAssignment[]  // For playthrough
+  event_type?: EventType  // Event active when assignment was created
 }
 
 export interface SpinResult {
@@ -284,6 +285,7 @@ export interface SpinResult {
   bonus_challenges?: Challenge[]  // Available bonus challenges for playthrough
   can_drop: boolean
   drop_penalty: number
+  event_type?: EventType  // Event active during spin
 }
 
 export interface CompleteResult {

frontend/src/utils/activity.ts

@@ -152,11 +152,12 @@ export function formatActivityMessage(activity: Activity): { title: string; deta
       const points = data.points ? `+${data.points}` : ''
       const streak = data.streak && (data.streak as number) > 1 ? `серия ${data.streak}` : ''
       const bonus = data.common_enemy_bonus ? `+${data.common_enemy_bonus} бонус` : ''
+      const eventBonus = data.event_bonus ? `(+${data.event_bonus} ${EVENT_NAMES[data.event_type as EventType] || 'бонус'})` : ''
 
       return {
         title: `завершил ${points}`,
         details: challenge || undefined,
-        extra: [game, streak, bonus].filter(Boolean).join(' • ') || undefined,
+        extra: [game, streak, bonus, eventBonus].filter(Boolean).join(' • ') || undefined,
       }
     }