From 58b63898de716c52bfec3af96025b61f9d4d6691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Thu, 9 Jun 2022 11:13:37 +0200 Subject: [PATCH] feat: enable email backups for everyone --- .../Panes/Backups/EmailBackups.tsx | 40 ++----------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx index 6bd2b4ddd..5fd110dfe 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/EmailBackups.tsx @@ -8,13 +8,7 @@ import Dropdown from '@/Components/Dropdown/Dropdown' import { DropdownItem } from '@/Components/Dropdown/DropdownItem' import Switch from '@/Components/Switch/Switch' import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator' -import { - FeatureStatus, - FeatureIdentifier, - EmailBackupFrequency, - MuteFailedBackupsEmailsOption, - SettingName, -} from '@standardnotes/snjs' +import { EmailBackupFrequency, MuteFailedBackupsEmailsOption, SettingName } from '@standardnotes/snjs' import PreferencesGroup from '../../PreferencesComponents/PreferencesGroup' import PreferencesSegment from '../../PreferencesComponents/PreferencesSegment' @@ -27,7 +21,6 @@ const EmailBackups = ({ application }: Props) => { const [emailFrequency, setEmailFrequency] = useState(EmailBackupFrequency.Disabled) const [emailFrequencyOptions, setEmailFrequencyOptions] = useState([]) const [isFailedBackupEmailMuted, setIsFailedBackupEmailMuted] = useState(true) - const [isEntitledToEmailBackups, setIsEntitledToEmailBackups] = useState(false) const loadEmailFrequencySetting = useCallback(async () => { if (!application.getUser()) { @@ -59,9 +52,6 @@ const EmailBackups = ({ application }: Props) => { }, [application]) useEffect(() => { - const emailBackupsFeatureStatus = application.features.getFeatureStatus(FeatureIdentifier.DailyEmailBackup) - setIsEntitledToEmailBackups(emailBackupsFeatureStatus === FeatureStatus.Entitled) - const frequencyOptions = [] for (const frequency in EmailBackupFrequency) { const frequencyValue = EmailBackupFrequency[frequency as keyof typeof EmailBackupFrequency] @@ -96,9 +86,6 @@ const EmailBackups = ({ application }: Props) => { } const toggleMuteFailedBackupEmails = async () => { - if (!isEntitledToEmailBackups) { - return - } const previousValue = isFailedBackupEmailMuted setIsFailedBackupEmailMuted(!isFailedBackupEmailMuted) @@ -109,9 +96,6 @@ const EmailBackups = ({ application }: Props) => { } const handleEmailFrequencyChange = (item: string) => { - if (!isEntitledToEmailBackups) { - return - } updateEmailFrequency(item as EmailBackupFrequency).catch(console.error) } @@ -119,20 +103,7 @@ const EmailBackups = ({ application }: Props) => { Email Backups - {!isEntitledToEmailBackups && ( - <> - - A Plus or Pro subscription plan - is required to enable Email Backups.{' '} - - Learn more - - . - - - - )} -
+
{!isDesktopApplication() && ( Daily encrypted email backups of your entire data set delivered directly to your inbox. @@ -150,7 +121,6 @@ const EmailBackups = ({ application }: Props) => { items={emailFrequencyOptions} value={emailFrequency} onChange={handleEmailFrequencyChange} - disabled={!isEntitledToEmailBackups} /> )}
@@ -163,11 +133,7 @@ const EmailBackups = ({ application }: Props) => { {isLoading ? (
) : ( - + )}