From 961bb84e4c87555bbce930a87291938a988a483a Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 28 Mar 2024 11:07:01 +0100
Subject: [PATCH] Fix `<RelativeTimestamp>` types (#29781)

---
 .../mastodon/components/relative_timestamp.tsx    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/javascript/mastodon/components/relative_timestamp.tsx b/app/javascript/mastodon/components/relative_timestamp.tsx
index b9e1e4f8fd..ac385e88c6 100644
--- a/app/javascript/mastodon/components/relative_timestamp.tsx
+++ b/app/javascript/mastodon/components/relative_timestamp.tsx
@@ -191,7 +191,7 @@ const timeRemainingString = (
 interface Props {
   intl: IntlShape;
   timestamp: string;
-  year: number;
+  year?: number;
   futureDate?: boolean;
   short?: boolean;
 }
@@ -203,11 +203,6 @@ class RelativeTimestamp extends Component<Props, States> {
     now: Date.now(),
   };
 
-  static defaultProps = {
-    year: new Date().getFullYear(),
-    short: true,
-  };
-
   _timer: number | undefined;
 
   shouldComponentUpdate(nextProps: Props, nextState: States) {
@@ -257,7 +252,13 @@ class RelativeTimestamp extends Component<Props, States> {
   }
 
   render() {
-    const { timestamp, intl, year, futureDate, short } = this.props;
+    const {
+      timestamp,
+      intl,
+      futureDate,
+      year = new Date().getFullYear(),
+      short = true,
+    } = this.props;
 
     const timeGiven = timestamp.includes('T');
     const date = new Date(timestamp);