diff --git a/app/soapbox/components/announcements/announcement.tsx b/app/soapbox/components/announcements/announcement.tsx index f6344f7b5..ea96b37fd 100644 --- a/app/soapbox/components/announcements/announcement.tsx +++ b/app/soapbox/components/announcements/announcement.tsx @@ -34,22 +34,23 @@ const Announcement: React.FC = ({ announcement, addReaction, remo {' '} - {' '} diff --git a/app/soapbox/components/relative-timestamp.tsx b/app/soapbox/components/relative-timestamp.tsx index d530051d8..6af0883c6 100644 --- a/app/soapbox/components/relative-timestamp.tsx +++ b/app/soapbox/components/relative-timestamp.tsx @@ -17,11 +17,11 @@ const messages = defineMessages({ }); const dateFormatOptions: FormatDateOptions = { - hour12: false, + hour12: true, year: 'numeric', month: 'short', day: '2-digit', - hour: '2-digit', + hour: 'numeric', minute: '2-digit', }; @@ -32,8 +32,8 @@ const shortDateFormatOptions: FormatDateOptions = { const SECOND = 1000; const MINUTE = 1000 * 60; -const HOUR = 1000 * 60 * 60; -const DAY = 1000 * 60 * 60 * 24; +const HOUR = 1000 * 60 * 60; +const DAY = 1000 * 60 * 60 * 24; const MAX_DELAY = 2147483647; @@ -170,12 +170,12 @@ class RelativeTimestamp extends React.Component { this.setState({ now: Date.now() }); diff --git a/app/soapbox/features/admin/moderation_log.tsx b/app/soapbox/features/admin/moderation_log.tsx index b7a9bce2e..606858ec8 100644 --- a/app/soapbox/features/admin/moderation_log.tsx +++ b/app/soapbox/features/admin/moderation_log.tsx @@ -32,7 +32,7 @@ const ModerationLog = () => { setIsLoading(false); setLastPage(1); }) - .catch(() => {}); + .catch(() => { }); }, []); const handleLoadMore = () => { @@ -43,7 +43,7 @@ const ModerationLog = () => { .then(() => { setIsLoading(false); setLastPage(page); - }).catch(() => {}); + }).catch(() => { }); }; return ( @@ -62,11 +62,11 @@ const ModerationLog = () => {
diff --git a/app/soapbox/features/auth_token_list/index.tsx b/app/soapbox/features/auth_token_list/index.tsx index ac98fd91f..dec5aedba 100644 --- a/app/soapbox/features/auth_token_list/index.tsx +++ b/app/soapbox/features/auth_token_list/index.tsx @@ -31,11 +31,11 @@ const AuthToken: React.FC = ({ token }) => { @@ -51,7 +51,7 @@ const AuthToken: React.FC = ({ token }) => { ); }; -const AuthTokenList: React.FC = () =>{ +const AuthTokenList: React.FC = () => { const dispatch = useAppDispatch(); const intl = useIntl(); const tokens = useAppSelector(state => state.security.get('tokens').reverse()); diff --git a/app/soapbox/features/status/components/detailed-status.tsx b/app/soapbox/features/status/components/detailed-status.tsx index f484be4cb..a7db21f2c 100644 --- a/app/soapbox/features/status/components/detailed-status.tsx +++ b/app/soapbox/features/status/components/detailed-status.tsx @@ -108,7 +108,7 @@ const DetailedStatus: React.FC = ({ - + @@ -122,7 +122,7 @@ const DetailedStatus: React.FC = ({ tabIndex={0} > - + diff --git a/app/soapbox/features/ui/components/compare_history_modal.tsx b/app/soapbox/features/ui/components/compare_history_modal.tsx index 62898a8cb..dd73c8d79 100644 --- a/app/soapbox/features/ui/components/compare_history_modal.tsx +++ b/app/soapbox/features/ui/components/compare_history_modal.tsx @@ -79,7 +79,7 @@ const CompareHistoryModal: React.FC = ({ onClose, statusId )} - + ); diff --git a/app/soapbox/features/ui/components/profile_fields_panel.tsx b/app/soapbox/features/ui/components/profile_fields_panel.tsx index 5674a3cff..053226dcc 100644 --- a/app/soapbox/features/ui/components/profile_fields_panel.tsx +++ b/app/soapbox/features/ui/components/profile_fields_panel.tsx @@ -22,8 +22,8 @@ const dateFormatOptions: FormatDateOptions = { month: 'short', day: 'numeric', year: 'numeric', - hour12: false, - hour: '2-digit', + hour12: true, + hour: 'numeric', minute: '2-digit', };