From de64f1bfce6d343fe698c55d6eaf307d200df3ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20S=C3=B3jko?= <karolsojko@protonmail.com>
Date: Fri, 23 Sep 2022 10:17:21 +0200
Subject: [PATCH] fix(web): move email notification preferences to account pane
 (#1620)

---
 .../Preferences/Panes/Account/AccountPreferences.tsx  |  2 ++
 .../Preferences/Panes/{General => Account}/Email.tsx  | 11 ++++++-----
 .../Components/Preferences/Panes/General/General.tsx  |  2 --
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename packages/web/src/javascripts/Components/Preferences/Panes/{General => Account}/Email.tsx (95%)

diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx
index 30391f525..f9f9e77ce 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/AccountPreferences.tsx
@@ -9,6 +9,7 @@ import SignOutWrapper from './SignOutView'
 import FilesSection from './Files'
 import PreferencesPane from '../../PreferencesComponents/PreferencesPane'
 import SubscriptionSharing from './SubscriptionSharing/SubscriptionSharing'
+import Email from './Email'
 
 type Props = {
   application: WebApplication
@@ -30,6 +31,7 @@ const AccountPreferences = ({ application, viewControllerManager }: Props) => (
     {application.hasAccount() && viewControllerManager.featuresController.hasFiles && (
       <FilesSection application={application} />
     )}
+    <Email application={application} />
     <SignOutWrapper application={application} viewControllerManager={viewControllerManager} />
   </PreferencesPane>
 )
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Email.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email.tsx
similarity index 95%
rename from packages/web/src/javascripts/Components/Preferences/Panes/General/Email.tsx
rename to packages/web/src/javascripts/Components/Preferences/Panes/Account/Email.tsx
index e5d3f9115..deaba555b 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Email.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email.tsx
@@ -1,13 +1,14 @@
+import { MuteMarketingEmailsOption, MuteSignInEmailsOption, SettingName } from '@standardnotes/snjs'
+import { observer } from 'mobx-react-lite'
+import { FunctionComponent, useCallback, useEffect, useState } from 'react'
+
 import HorizontalSeparator from '@/Components/Shared/HorizontalSeparator'
 import Switch from '@/Components/Switch/Switch'
 import { Subtitle, Text, Title } from '@/Components/Preferences/PreferencesComponents/Content'
 import { WebApplication } from '@/Application/Application'
-import { MuteMarketingEmailsOption, MuteSignInEmailsOption, SettingName } from '@standardnotes/snjs'
-import { observer } from 'mobx-react-lite'
-import { FunctionComponent, useCallback, useEffect, useState } from 'react'
 import { STRING_FAILED_TO_UPDATE_USER_SETTING } from '@/Constants/Strings'
-import PreferencesGroup from '../../PreferencesComponents/PreferencesGroup'
-import PreferencesSegment from '../../PreferencesComponents/PreferencesSegment'
+import PreferencesGroup from '@/Components/Preferences/PreferencesComponents/PreferencesGroup'
+import PreferencesSegment from '@/Components/Preferences/PreferencesComponents/PreferencesSegment'
 import Spinner from '@/Components/Spinner/Spinner'
 
 type Props = {
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/General.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/General/General.tsx
index 178cf42e8..db3e8a94a 100644
--- a/packages/web/src/javascripts/Components/Preferences/Panes/General/General.tsx
+++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/General.tsx
@@ -8,7 +8,6 @@ import Defaults from './Defaults'
 import LabsPane from './Labs/Labs'
 import Advanced from '@/Components/Preferences/Panes/General/Advanced/AdvancedSection'
 import PreferencesPane from '../../PreferencesComponents/PreferencesPane'
-import Email from './Email'
 
 type Props = {
   viewControllerManager: ViewControllerManager
@@ -20,7 +19,6 @@ const General: FunctionComponent<Props> = ({ viewControllerManager, application,
   <PreferencesPane>
     <Tools application={application} />
     <Defaults application={application} />
-    <Email application={application} />
     <LabsPane application={application} />
     <Advanced
       application={application}