don't show time in dates long in the past

src/lib/strformat.js

@@ -3,15 +3,17 @@ export function shortDateFormat(then, locale) {
   locale = locale || window.navigator.userLanguage || window.navigator.language;
   const now = new Date();
   if (then.getFullYear() == now.getFullYear()) {
+    // Same year.
     if (then.getMonth() == now.getMonth() && then.getDate() == now.getDate()) {
-	    return then.toLocaleTimeString(locale, {hour12: false, hour: '2-digit', minute: '2-digit'});
+      // Same month and day, show time only.
-    } else {
+      return then.toLocaleTimeString(locale, {hour12: false, hour: '2-digit', minute: '2-digit'});
-	    return then.toLocaleDateString(locale,
-        {hour12: false, month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit'});
     }
+    // Different month and/or day, show month day, time.
+    return then.toLocaleDateString(locale,
+      {hour12: false, month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit'});
   }
-  return then.toLocaleDateString(locale,
+  // Different year: just show the date.
-    {hour12: false, year: 'numeric', month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit'});
+  return then.toLocaleDateString(locale, {year: 'numeric', month: 'short', day: 'numeric'});
 }
 
 // Convert seconds to minutes:seconds, i.e. 156 sec -> 2:36.

umd/index.dev.js

@@ -499,24 +499,21 @@ function shortDateFormat(then, locale) {
         hour: '2-digit',
         minute: '2-digit'
       });
-    } else {
-      return then.toLocaleDateString(locale, {
-        hour12: false,
-        month: 'short',
-        day: 'numeric',
-        hour: '2-digit',
-        minute: '2-digit'
-      });
     }
+
+    return then.toLocaleDateString(locale, {
+      hour12: false,
+      month: 'short',
+      day: 'numeric',
+      hour: '2-digit',
+      minute: '2-digit'
+    });
   }
 
   return then.toLocaleDateString(locale, {
-    hour12: false,
     year: 'numeric',
     month: 'short',
-    day: 'numeric',
+    day: 'numeric'
-    hour: '2-digit',
-    minute: '2-digit'
   });
 }
 function secondsToTime(seconds) {
@@ -5204,6 +5201,8 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
   }
 
   handleTopicSelected(topicName) {
+    console.log("handleTopicSelected", topicName);
+
     if (this.state.newTopicParams && this.state.newTopicParams._topicName != topicName) {
       this.setState({
         newTopicParams: null