diff --git a/app/soapbox/features/ui/components/subscription-button.tsx b/app/soapbox/features/ui/components/subscription-button.tsx index 6bcded63a..810704fd6 100644 --- a/app/soapbox/features/ui/components/subscription-button.tsx +++ b/app/soapbox/features/ui/components/subscription-button.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { @@ -16,7 +16,6 @@ const messages = defineMessages({ subscribe: { id: 'account.subscribe', defaultMessage: 'Subscribe to notifications from @{name}' }, unsubscribe: { id: 'account.unsubscribe', defaultMessage: 'Unsubscribe to notifications from @{name}' }, subscribeSuccess: { id: 'account.subscribe.success', defaultMessage: 'You have subscribed to this account.' }, - subscribeSuccessNotice: { id: 'account.subscribe.successNotice', defaultMessage: 'You have subscribed to this account, but your web notifications are disabled. Please enable them to receive notifications from @{name}.' }, unsubscribeSuccess: { id: 'account.unsubscribe.success', defaultMessage: 'You have unsubscribed from this account.' }, subscribeFailure: { id: 'account.subscribe.failure', defaultMessage: 'An error occurred trying to subscribed to this account.' }, unsubscribeFailure: { id: 'account.unsubscribe.failure', defaultMessage: 'An error occurred trying to unsubscribed to this account.' }, @@ -31,14 +30,6 @@ const SubscriptionButton = ({ account }: ISubscriptionButton) => { const features = useFeatures(); const intl = useIntl(); - const [hasWebNotificationsEnabled, setWebNotificationsEnabled] = useState(true); - - const checkWebNotifications = () => { - Notification.requestPermission() - .then((value) => setWebNotificationsEnabled(value === 'granted')) - .catch(() => null); - }; - const isFollowing = account.relationship?.following; const isRequested = account.relationship?.requested; const isSubscribed = features.accountNotifies ? @@ -48,13 +39,8 @@ const SubscriptionButton = ({ account }: ISubscriptionButton) => { intl.formatMessage(messages.unsubscribe, { name: account.get('username') }) : intl.formatMessage(messages.subscribe, { name: account.get('username') }); - const onSubscribeSuccess = () => { - if (hasWebNotificationsEnabled) { - dispatch(snackbar.success(intl.formatMessage(messages.subscribeSuccess))); - } else { - dispatch(snackbar.info(intl.formatMessage(messages.subscribeSuccessNotice, { name: account.get('username') }))); - } - }; + const onSubscribeSuccess = () => + dispatch(snackbar.success(intl.formatMessage(messages.subscribeSuccess))); const onSubscribeFailure = () => dispatch(snackbar.error(intl.formatMessage(messages.subscribeFailure))); @@ -97,12 +83,6 @@ const SubscriptionButton = ({ account }: ISubscriptionButton) => { } }; - useEffect(() => { - if (features.accountSubscriptions || features.accountNotifies) { - checkWebNotifications(); - } - }, []); - if (!features.accountSubscriptions && !features.accountNotifies) { return null; }