From 9448c884ee8dd4bbb16147680e1f9087d83982e8 Mon Sep 17 00:00:00 2001
From: Ben Gotow <ben@foundry376.com>
Date: Fri, 20 Oct 2017 16:28:17 -0700
Subject: [PATCH] Fix eslint / prettier lint errors

---
 CHANGELOG.md                                              | 8 ++++++++
 .../message-list/lib/sidebar-participant-picker.jsx       | 4 +++-
 app/src/flux/stores/draft-helpers.es6                     | 1 -
 app/src/mail-rules-templates.es6                          | 2 --
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8f438d6d..d07d49a0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,8 +8,16 @@ Features:
 
 - Mailspring now warns you if you the salutation in your email ("Hey Ben!") doesn't match the name of a recipient or appears misspelled.
 
+- A new keyboard shortcut allows you to attach a file in the composer. (Ctrl-Shift-A by default!)
+
 Fixes:
 
+- The contact sidebar now loads correctly if you switch to a contact with no name.
+
+- On Windows, Mailspring no longer needs to be restarted once before you can link a Gmail account.
+
+- When replying to a message you sent in a thread, Mailspring no longer incorrectly addresses the new message to yourself.
+
 - Mail rules now run correctly as new mail is received.
 
 - The label picker is now correctly hidden if your selection includes threads from non-Gmail accounts.
diff --git a/app/internal_packages/message-list/lib/sidebar-participant-picker.jsx b/app/internal_packages/message-list/lib/sidebar-participant-picker.jsx
index 7f8ad06ac..2b14b0eb5 100644
--- a/app/internal_packages/message-list/lib/sidebar-participant-picker.jsx
+++ b/app/internal_packages/message-list/lib/sidebar-participant-picker.jsx
@@ -43,7 +43,9 @@ export default class SidebarParticipantPicker extends React.Component {
   _onSelectContact = event => {
     const { sortedContacts } = this.state;
     const [email, name] = event.target.value.split(SPLIT_KEY);
-    const contact = sortedContacts.find(c => (c.name === name || typeof c.name == "undefined" ) && c.email === email);
+    const contact = sortedContacts.find(
+      c => (c.name === name || typeof c.name === 'undefined') && c.email === email
+    );
     return Actions.focusContact(contact);
   };
 
diff --git a/app/src/flux/stores/draft-helpers.es6 b/app/src/flux/stores/draft-helpers.es6
index 189da6792..6f7ecdb93 100644
--- a/app/src/flux/stores/draft-helpers.es6
+++ b/app/src/flux/stores/draft-helpers.es6
@@ -3,7 +3,6 @@ import Message from '../models/message';
 import * as ExtensionRegistry from '../../registries/extension-registry';
 import DOMUtils from '../../dom-utils';
 
-import QuotedHTMLTransformer from '../../services/quoted-html-transformer';
 import InlineStyleTransformer from '../../services/inline-style-transformer';
 import SanitizeTransformer from '../../services/sanitize-transformer';
 import MessageUtils from '../models/message-utils';
diff --git a/app/src/mail-rules-templates.es6 b/app/src/mail-rules-templates.es6
index 8917eff77..77b0fa570 100644
--- a/app/src/mail-rules-templates.es6
+++ b/app/src/mail-rules-templates.es6
@@ -1,6 +1,4 @@
 import MailspringObservables from 'mailspring-observables';
-import Label from './flux/models/label';
-import CategoryStore from './flux/stores/category-store';
 import { Template } from './components/scenario-editor-models';
 
 export const ConditionTemplates = [