Merge commit '8a0261c51caf76b6d12e3801da471759c31c9608' into glitch-soc/merge-upstream

app/javascript/mastodon/features/account_timeline/v2/styles.module.scss

@@ -5,6 +5,7 @@
 .filterSelectButton {
   appearance: none;
   border: none;
+  color: inherit;
   background: none;
   padding: 8px 0;
   font-size: 15px;

app/javascript/mastodon/features/collections/detail/index.tsx

@@ -105,8 +105,8 @@ const CollectionHeader: React.FC<{ collection: ApiCollectionJSON }> = ({
     );
   }, [collection, dispatch]);
 
-  const location = useLocation<{ newCollection?: boolean }>();
-  const wasJustCreated = location.state.newCollection;
+  const location = useLocation<{ newCollection?: boolean } | undefined>();
+  const wasJustCreated = location.state?.newCollection;
   useEffect(() => {
     if (wasJustCreated) {
       handleShare();

app/javascript/mastodon/features/collections/detail/share_modal.tsx

@@ -40,8 +40,8 @@ export const CollectionShareModal: React.FC<{
 }> = ({ collection, onClose }) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
-  const location = useLocation<{ newCollection?: boolean }>();
-  const isNew = !!location.state.newCollection;
+  const location = useLocation<{ newCollection?: boolean } | undefined>();
+  const isNew = !!location.state?.newCollection;
   const isOwnCollection = collection.account_id === me;
 
   const collectionLink = `${window.location.origin}/collections/${collection.id}`;