Merge branch 'master' into dist

src/utils/index.ts

@@ -24,9 +24,7 @@ export function convertTimestampToDate(timestamp?: number): string {
     minute: 'numeric',
     second: 'numeric',
   };
-  return timestamp ?
+  return timestamp ? new Date(timestamp).toLocaleString('en-GB', options) : '-';
-    new Date(timestamp).toLocaleString('en-GB', options):
-    '-';
 }
 
 export function convertTimeZoneTypeToName(timeZone: TimeZone): string {