Merge branch 'main' into glitch-soc/merge-upstream

2022-11-07 07:50:47 +01:00
parent 54101563bb a70e2cd649
commit 6c0a6097ff
10 changed files with 19 additions and 15 deletions
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -57,7 +57,7 @@ class ColumnHeader extends React.PureComponent {
  }

  handleTitleClick = () => {
-    this.props.onClick();
+    this.props.onClick?.();
  }

  handleMoveLeft = () => {
--- a/app/javascript/mastodon/features/notifications/components/column_settings.js
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.js
@@ -21,7 +21,7 @@ export default class ColumnSettings extends React.PureComponent {
    onRequestNotificationPermission: PropTypes.func,
    alertsEnabled: PropTypes.bool,
    browserSupport: PropTypes.bool,
-    browserPermission: PropTypes.bool,
+    browserPermission: PropTypes.string,
  };

  onPushChange = (path, checked) => {