Merge remote-tracking branch 'parent/main' into upstream-20240531

2024-05-31 08:27:09 +09:00 · 2024-05-31 08:27:09 +09:00 · 13ad383039
commit 13ad383039
parent f3f9e5d545 7f808ff6e9
101 changed files with 1486 additions and 1232 deletions
--- a/app/javascript/mastodon/components/short_number.tsx
+++ b/app/javascript/mastodon/components/short_number.tsx
@ -54,7 +54,7 @@ const ShortNumberCounter: React.FC<ShortNumberCounterProps> = ({ value }) => {

  const count = (
    <FormattedNumber
-      value={rawNumber}
+      value={rawNumber ?? 0}
      maximumFractionDigits={maxFractionDigits}
    />
  );