From 78f584e3cc2e159388785cbbf13ae4fa73e8612e Mon Sep 17 00:00:00 2001
From: Ben Gotow <ben@foundry376.com>
Date: Wed, 8 Nov 2017 20:50:23 +0100
Subject: [PATCH] Finish new welcome newsletter series

---
 .../onboarding/lib}/newsletter-signup.jsx              | 10 +++++-----
 .../onboarding/lib/page-initial-preferences.cjsx       |  3 ++-
 .../send-reminders/lib/send-reminders-popover.jsx      |  9 +++------
 app/src/global/mailspring-component-kit.es6            |  1 -
 4 files changed, 10 insertions(+), 13 deletions(-)
 rename app/{src/components => internal_packages/onboarding/lib}/newsletter-signup.jsx (90%)

diff --git a/app/src/components/newsletter-signup.jsx b/app/internal_packages/onboarding/lib/newsletter-signup.jsx
similarity index 90%
rename from app/src/components/newsletter-signup.jsx
rename to app/internal_packages/onboarding/lib/newsletter-signup.jsx
index 71f343644..989f40025 100644
--- a/app/src/components/newsletter-signup.jsx
+++ b/app/internal_packages/onboarding/lib/newsletter-signup.jsx
@@ -2,7 +2,7 @@ import _ from 'underscore';
 import React from 'react';
 import PropTypes from 'prop-types';
 import { RetinaImg, Flexbox } from 'mailspring-component-kit';
-import { makeRequest } from '../flux/mailspring-api-request';
+import { MailspringAPIRequest } from 'mailspring-exports';
 
 export default class NewsletterSignup extends React.Component {
   static displayName = 'NewsletterSignup';
@@ -41,7 +41,7 @@ export default class NewsletterSignup extends React.Component {
   _onGetStatus = async (props = this.props) => {
     this._setState({ status: 'Pending' });
     try {
-      const { status } = await makeRequest({
+      const { status } = await MailspringAPIRequest.makeRequest({
         server: 'identity',
         method: 'GET',
         path: this._path(props),
@@ -59,7 +59,7 @@ export default class NewsletterSignup extends React.Component {
   _onSubscribe = async () => {
     this._setState({ status: 'Pending' });
     try {
-      const { status } = await makeRequest({
+      const { status } = await MailspringAPIRequest.makeRequest({
         server: 'identity',
         method: 'POST',
         path: this._path(),
@@ -73,7 +73,7 @@ export default class NewsletterSignup extends React.Component {
   _onUnsubscribe = () => {
     this._setState({ status: 'Pending' });
     try {
-      const { status } = makeRequest({
+      const { status } = MailspringAPIRequest.makeRequest({
         server: 'identity',
         method: 'DELETE',
         path: this._path(),
@@ -85,7 +85,7 @@ export default class NewsletterSignup extends React.Component {
   };
 
   _path(props = this.props) {
-    return `/api/newsletter-subscription/${encodeURIComponent(
+    return `/api/newsletter/first-account/${encodeURIComponent(
       props.emailAddress
     )}?name=${encodeURIComponent(props.name)}`;
   }
diff --git a/app/internal_packages/onboarding/lib/page-initial-preferences.cjsx b/app/internal_packages/onboarding/lib/page-initial-preferences.cjsx
index 1393843a3..01ef78837 100644
--- a/app/internal_packages/onboarding/lib/page-initial-preferences.cjsx
+++ b/app/internal_packages/onboarding/lib/page-initial-preferences.cjsx
@@ -3,9 +3,10 @@ PropTypes = require 'prop-types'
 path = require 'path'
 fs = require 'fs'
 _ = require 'underscore'
-{RetinaImg, Flexbox, ConfigPropContainer, NewsletterSignup} = require 'mailspring-component-kit'
+{RetinaImg, Flexbox, ConfigPropContainer} = require 'mailspring-component-kit'
 {AccountStore} = require 'mailspring-exports'
 OnboardingActions = require('./onboarding-actions').default
+NewsletterSignup = require('./newsletter-signup').default
 
 # NOTE: Temporarily copied from preferences module
 class AppearanceModeOption extends React.Component
diff --git a/app/internal_packages/send-reminders/lib/send-reminders-popover.jsx b/app/internal_packages/send-reminders/lib/send-reminders-popover.jsx
index b6bc4cdbe..019240ce4 100644
--- a/app/internal_packages/send-reminders/lib/send-reminders-popover.jsx
+++ b/app/internal_packages/send-reminders/lib/send-reminders-popover.jsx
@@ -5,16 +5,13 @@ import { DateUtils } from 'mailspring-exports';
 import { DatePickerPopover } from 'mailspring-component-kit';
 
 const SendRemindersOptions = {
-  'In 1 hour': DateUtils.in1Hour,
-  'In 2 hours': DateUtils.in2Hours,
-  'In 4 hours': () => DateUtils.minutesFromNow(240),
+  'In 3 hours': () => DateUtils.minutesFromNow(180),
   'Tomorrow morning': DateUtils.tomorrow,
   'Tomorrow evening': DateUtils.tomorrowEvening,
-  'In 2 days': () => DateUtils.hoursFromNow(48),
-  'In 4 days': () => DateUtils.hoursFromNow(96),
+  'In 3 days': () => DateUtils.hoursFromNow(72),
   'In 1 week': () => DateUtils.weeksFromNow(1),
   'In 2 weeks': () => DateUtils.weeksFromNow(2),
-  'In 1 month': () => DateUtils.monthsFromNow(1),
+  'In a month': () => DateUtils.monthsFromNow(1),
 };
 
 function SendRemindersPopover(props) {
diff --git a/app/src/global/mailspring-component-kit.es6 b/app/src/global/mailspring-component-kit.es6
index dfb0fab5b..1de7ad5d8 100644
--- a/app/src/global/mailspring-component-kit.es6
+++ b/app/src/global/mailspring-component-kit.es6
@@ -113,7 +113,6 @@ lazyLoadFrom('GeneratedForm', 'generated-form');
 lazyLoadFrom('GeneratedFieldset', 'generated-form');
 
 lazyLoad('ScenarioEditor', 'scenario-editor');
-lazyLoad('NewsletterSignup', 'newsletter-signup');
 
 lazyLoad('SearchBar', 'search-bar');