From 855255e51d34f00b2e1701bd6c0783211c9110d2 Mon Sep 17 00:00:00 2001
From: Alexandru Munteanu <alexandru.munt@gmail.com>
Date: Thu, 19 Jul 2018 14:19:01 +0300
Subject: [PATCH] fix(fix unsubscribe from emails):
---
.../src/components/UserProfile/EmailNotifications.js | 6 +++---
.../src/components/UserProfile/UserProfilePage.js | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/packages/components-faraday/src/components/UserProfile/EmailNotifications.js b/packages/components-faraday/src/components/UserProfile/EmailNotifications.js
index 025b39f98..ac99e4104 100644
--- a/packages/components-faraday/src/components/UserProfile/EmailNotifications.js
+++ b/packages/components-faraday/src/components/UserProfile/EmailNotifications.js
@@ -8,7 +8,7 @@ import {
import { Row, RowItem, LabelHeader, LinkText } from '../UIComponents/FormItems'
-const EmailNotifications = ({ subscribed = '', subscribe, unsubscribe }) => (
+const EmailNotifications = ({ subscribed, subscribe, unsubscribe }) => (
<Root>
<Row noMargin>
<RowItem>
@@ -46,7 +46,7 @@ export default compose(
title: 'Subscribe to emails',
subtitle: 'Are you sure you want to subscribe to emails?',
onConfirm: () => {
- changeEmailSubscription(userId, false)
+ changeEmailSubscription(userId, true)
hideModal()
},
onCancel: hideModal,
@@ -62,7 +62,7 @@ export default compose(
title: 'Unsubscribe from emails',
subtitle: 'Are you sure you want to unsubscribe from emails?',
onConfirm: () => {
- changeEmailSubscription(userId, true)
+ changeEmailSubscription(userId, false)
hideModal()
},
onCancel: hideModal,
diff --git a/packages/components-faraday/src/components/UserProfile/UserProfilePage.js b/packages/components-faraday/src/components/UserProfile/UserProfilePage.js
index 7e4e7cbd7..778463345 100644
--- a/packages/components-faraday/src/components/UserProfile/UserProfilePage.js
+++ b/packages/components-faraday/src/components/UserProfile/UserProfilePage.js
@@ -23,7 +23,7 @@ const UserProfilePage = ({ history, user, changeEmailSubscription }) => (
<AccountDetails history={history} user={user} />
<EmailNotifications
changeEmailSubscription={changeEmailSubscription}
- subscribed={get(user, 'notifications.email.user')}
+ subscribed={get(user, 'notifications.email.user', true)}
userId={get(user, 'id')}
/>
<LinkOrcID id={get(user, 'id')} orcid={get(user, 'orcid')} />
--
GitLab