Merge branch 'master' into stable

CHANGELOG.md

@@ -6,6 +6,8 @@
   + `Config.json` is no longer mangled at launch in some scenarios, which caused
     the app to log you out. JSON parsing errors are also handled more gracefully.
   + Clicking "Propose Times" in a composer window no longer crashes N1.
+  + When using Mail Merge, N1 still warns you about missing body, subject line, etc.
+  + "Sending in X minutes" is no longer displayed for Snooze / Send Later dates in the past.
   + Message indexes are now created properly, resolving issues where incorrect drafts
     could be synced or sent in some scenarios.
   + On Windows, installing the update no longer displays a dialog "`app-0.4.X` is a folder."

internal_packages/composer/lib/action-bar-plugins.jsx

@@ -11,6 +11,7 @@ export default class ActionBarPlugins extends React.Component {
   static propTypes = {
     draft: React.PropTypes.object,
     session: React.PropTypes.object,
+    isValidDraft: React.PropTypes.func,
   }
 
   constructor(props) {
@@ -69,6 +70,7 @@ export default class ActionBarPlugins extends React.Component {
             threadId: this.props.draft.threadId,
             draftClientId: this.props.draft.clientId,
             session: this.props.session,
+            isValidDraft: this.props.isValidDraft,
           }}
         />
       </span>

internal_packages/composer/lib/composer-view.jsx

@@ -335,7 +335,11 @@ export default class ComposerView extends React.Component {
   _renderActionsRegion() {
     return (
       <div className="composer-action-bar-content">
-        <ActionBarPlugins draft={this.props.draft} session={this.props.session} />
+        <ActionBarPlugins
+          draft={this.props.draft}
+          session={this.props.session}
+          isValidDraft={this._isValidDraft}
+        />
 
         <button
           tabIndex={-1}

internal_packages/personal-level-indicators/stylesheets/main.less

@@ -4,6 +4,7 @@
 div.personal-level-icon {
   display: inline-block;
   margin: 0 3px;
+  width: 12px;
   img {
     vertical-align: initial;
   }

src/browser/config-persistence-manager.es6

@@ -23,12 +23,12 @@ export default class ConfigPersistenceManager {
   initializeConfigDirectory() {
     if (!fs.existsSync(this.configDirPath)) {
       fs.makeTreeSync(this.configDirPath);
-      const templateConfigDirPath = fs.resolve(this.resourcePath, 'dot-nylas');
+      const templateConfigDirPath = path.join(this.resourcePath, 'dot-nylas');
       fs.copySync(templateConfigDirPath, this.configDirPath);
     }
 
     if (!fs.existsSync(this.configFilePath)) {
-      const templateConfigPath = fs.resolve(this.resourcePath, 'dot-nylas', 'config.json');
+      const templateConfigPath = path.join(this.resourcePath, 'dot-nylas', 'config.json');
       const templateConfig = fs.readFileSync(templateConfigPath);
       fs.writeFileSync(this.configFilePath, templateConfig);
     }

src/browser/window-launcher.es6

@@ -90,7 +90,9 @@ export default class WindowLauncher {
   // events.  This is necessary for the app to quit promptly on Linux.
   // https://phab.nylas.com/T1282
   cleanupBeforeAppQuit() {
-    this.hotWindow.browserWindow.destroy()
+    if (this.hotWindow != null) {
+      this.hotWindow.browserWindow.destroy()
+    }
     this.hotWindow = null
   }