From d5a5cdd4eb2190325488f80038280a635900a56d Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Fri, 2 Oct 2015 15:01:26 -0700
Subject: [PATCH 1/4] switch(env): Move N1 to Nylas production API

---
 internal_packages/category-picker/lib/category-picker.cjsx | 3 ++-
 internal_packages/notifications/lib/activity-sidebar.cjsx  | 2 +-
 .../notifications/lib/initial-sync-activity.cjsx           | 2 +-
 .../onboarding/lib/nylas-api-environment-store.coffee      | 7 +++----
 src/flux/edgehill-api.coffee                               | 1 -
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/internal_packages/category-picker/lib/category-picker.cjsx b/internal_packages/category-picker/lib/category-picker.cjsx
index c19e055d8..b031c819f 100644
--- a/internal_packages/category-picker/lib/category-picker.cjsx
+++ b/internal_packages/category-picker/lib/category-picker.cjsx
@@ -322,7 +322,8 @@ class CategoryPicker extends React.Component
 
   _isUserFacing: (allInInbox, category) =>
     hiddenCategories = []
-    currentCategoryId = FocusedMailViewStore.mailView().categoryId()
+    currentCategoryId = FocusedMailViewStore.mailView()?.categoryId()
+
     if @_account?.usesLabels()
       hiddenCategories = ["all", "spam", "trash", "drafts", "sent"]
       if allInInbox
diff --git a/internal_packages/notifications/lib/activity-sidebar.cjsx b/internal_packages/notifications/lib/activity-sidebar.cjsx
index 596ca450a..ac2466d87 100644
--- a/internal_packages/notifications/lib/activity-sidebar.cjsx
+++ b/internal_packages/notifications/lib/activity-sidebar.cjsx
@@ -90,7 +90,7 @@ class ActivitySidebar extends React.Component
         <RetinaImg name="sending-spinner.gif" width={18} mode={RetinaImg.Mode.ContentPreserve} />
       </div>
       <div className="inner">
-        Syncing mail data&hellip;
+        Syncing your mailbox&hellip;
       </div>
     </div>
 
diff --git a/internal_packages/notifications/lib/initial-sync-activity.cjsx b/internal_packages/notifications/lib/initial-sync-activity.cjsx
index ea367211f..3244c3d36 100644
--- a/internal_packages/notifications/lib/initial-sync-activity.cjsx
+++ b/internal_packages/notifications/lib/initial-sync-activity.cjsx
@@ -55,7 +55,7 @@ class InitialSyncActivity extends React.Component
     else
       <div className={classSet} key="initial-sync" onClick={=> @setState expandedSync: !@state.expandedSync}>
         {@_renderProgressBar(totalProgress)}
-        <div className="inner">Syncing mail data&hellip;</div>
+        <div className="inner">Syncing your mailbox&hellip;</div>
         {@_expandedSyncState()}
       </div>
 
diff --git a/internal_packages/onboarding/lib/nylas-api-environment-store.coffee b/internal_packages/onboarding/lib/nylas-api-environment-store.coffee
index 46c08c4c8..4e2d090af 100644
--- a/internal_packages/onboarding/lib/nylas-api-environment-store.coffee
+++ b/internal_packages/onboarding/lib/nylas-api-environment-store.coffee
@@ -4,11 +4,10 @@ NylasStore = require 'nylas-store'
 class NylasApiEnvironmentStore extends NylasStore
   constructor: ->
     @listenTo Actions.changeAPIEnvironment, @_setEnvironment
+    @_setEnvironment('production') unless atom.config.get('env')
 
-    defaultEnv = if atom.inDevMode() then 'staging' else 'staging'
-    @_setEnvironment(defaultEnv) unless atom.config.get('env')
-
-  getEnvironment: -> atom.config.get('env')
+  getEnvironment: ->
+    atom.config.get('env')
 
   _setEnvironment: (env) ->
     throw new Error("Environment #{env} is not allowed") unless env in ['development', 'experimental', 'staging', 'production']
diff --git a/src/flux/edgehill-api.coffee b/src/flux/edgehill-api.coffee
index f767e9436..6bbe1fe32 100644
--- a/src/flux/edgehill-api.coffee
+++ b/src/flux/edgehill-api.coffee
@@ -18,7 +18,6 @@ class EdgehillAPI
   _onConfigChanged: =>
     env = atom.config.get('env')
     if env is 'development'
-      # @APIRoot = "http://localhost:5009"
       @APIRoot = "https://edgehill-dev.nylas.com"
     else if env is 'experimental'
       @APIRoot = "https://edgehill-experimental.nylas.com"

From 88fdfd9a775a22219172cfeff7bf599bd55f7f70 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Fri, 2 Oct 2015 15:31:05 -0700
Subject: [PATCH 2/4] fix(specs): Fix specs for environment config

---
 docs/WritingSpecs.md                                      | 6 ++----
 .../spec/nylas-api-environment-store-spec.coffee          | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/WritingSpecs.md b/docs/WritingSpecs.md
index a1f158e96..9d2312be5 100644
--- a/docs/WritingSpecs.md
+++ b/docs/WritingSpecs.md
@@ -5,17 +5,15 @@ Section: Guides
 Order:   7
 ---
 
-# Writing specs
-
 Nylas uses [Jasmine](http://jasmine.github.io/1.3/introduction.html) as its spec framework. As a package developer, you can write specs using Jasmine 1.3 and get some quick wins. Jasmine specs can be run in N1 directly from the Developer menu, and the test environment provides you with helpful stubs. You can also require your own test framework, or use Jasmine for integration tests and your own framework for your existing business logic.
 
 This documentation describes using [Jasmine 1.3](http://jasmine.github.io/1.3/introduction.html) to write specs for a Nylas package.
 
-#### Running Specs
+### Running Specs
 
 You can run your package specs from `Developer > Run Package Specs...`. Once you've opened the spec window, you can see output and re-run your specs by clicking `Reload Specs`.
 
-#### Writing Specs
+### Writing Specs
 
 To create specs, place `js`, `coffee`, or `cjsx` files in the `spec` directory of your package. Spec files must end with the `-spec` suffix.
 
diff --git a/internal_packages/onboarding/spec/nylas-api-environment-store-spec.coffee b/internal_packages/onboarding/spec/nylas-api-environment-store-spec.coffee
index c6da261b6..fbbec1c6f 100644
--- a/internal_packages/onboarding/spec/nylas-api-environment-store-spec.coffee
+++ b/internal_packages/onboarding/spec/nylas-api-environment-store-spec.coffee
@@ -15,18 +15,18 @@ describe "NylasApiEnvironmentStore", ->
     spyOn(atom, "inDevMode").andReturn true
     spyOn(atom.config, "get").andReturn undefined
     store = new storeConstructor()
-    expect(atom.config.set).toHaveBeenCalledWith("env", "staging")
+    expect(atom.config.set).toHaveBeenCalledWith("env", "production")
 
   it "initializes with the correct default in production", ->
     spyOn(atom, "inDevMode").andReturn false
     spyOn(atom.config, "get").andReturn undefined
     store = new storeConstructor()
-    expect(atom.config.set).toHaveBeenCalledWith("env", "staging")
+    expect(atom.config.set).toHaveBeenCalledWith("env", "production")
 
   describe "when setting the environment", ->
     it "sets from the desired action", ->
-      Actions.changeAPIEnvironment("production")
-      expect(atom.config.set).toHaveBeenCalledWith("env", "production")
+      Actions.changeAPIEnvironment("staging")
+      expect(atom.config.set).toHaveBeenCalledWith("env", "staging")
 
     it "throws if the env is invalid", ->
       expect( -> Actions.changeAPIEnvironment("bad")).toThrow()

From 7d799b64e86d092dd2f46c4d2e3ed8cb012ece9f Mon Sep 17 00:00:00 2001
From: Drew Regitsky <drew@nylas.com>
Date: Fri, 2 Oct 2015 15:32:59 -0700
Subject: [PATCH 3/4] fix(onboarding): fix IMAP port fields, enter key behavior

Summary:
Fix issue where ports were being stored as strings - add a format field for
account settings that turns on casting to int when set to `integer`.

Change behavior of pressing enter - rather than always submitting, have it
move to the next page on multi-page account settings.

Test Plan: manual

Reviewers: evan, bengotow

Reviewed By: bengotow

Subscribers: bengotow

Differential Revision: https://phab.nylas.com/D2094
---
 .../onboarding/lib/account-settings-page.cjsx    | 16 ++++++++++++++--
 .../onboarding/lib/account-types.coffee          |  2 ++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/internal_packages/onboarding/lib/account-settings-page.cjsx b/internal_packages/onboarding/lib/account-settings-page.cjsx
index ded6eb8a6..6236a29f4 100644
--- a/internal_packages/onboarding/lib/account-settings-page.cjsx
+++ b/internal_packages/onboarding/lib/account-settings-page.cjsx
@@ -79,11 +79,16 @@ class AccountSettingsPage extends React.Component
 
   _onSettingsChanged: (event) =>
     field = event.target.dataset.field
+    format = event.target.dataset.format
+    int_formatter = (a) ->
+      i = parseInt(a)
+      if isNaN(i) then "" else i
+    formatter = if format is 'integer' then int_formatter else (a) -> a
     settings = @state.settings
     if event.target.type is 'checkbox'
       settings[field] = event.target.checked
     else
-      settings[field] = event.target.value
+      settings[field] = formatter(event.target.value)
     @setState({settings})
 
   _onValueChanged: (event) =>
@@ -94,7 +99,11 @@ class AccountSettingsPage extends React.Component
 
   _onFieldKeyPress: (event) =>
     if event.key in ['Enter', 'Return']
-      @_onSubmit()
+      pages = @state.provider.pages || []
+      if pages.length > @state.pageNumber+1
+        @_onNextButton()
+      else
+        @_onSubmit()
 
   _renderTitle: =>
     if @state.provider.name is 'gmail'
@@ -129,6 +138,7 @@ class AccountSettingsPage extends React.Component
            onChange={@_onValueChanged}
            onKeyPress={@_onFieldKeyPress}
            data-field={field.name}
+           data-format={field.format} ? ""
            className={errclass}
            placeholder={field.placeholder} />
       </label>
@@ -144,6 +154,7 @@ class AccountSettingsPage extends React.Component
              onChange={@_onSettingsChanged}
              onKeyPress={@_onFieldKeyPress}
              data-field={field.name}
+             data-format={field.format} ? ""
              className={field.className ? ""} />
           {field.label}
         </label>
@@ -159,6 +170,7 @@ class AccountSettingsPage extends React.Component
              onChange={@_onSettingsChanged}
              onKeyPress={@_onFieldKeyPress}
              data-field={field.name}
+             data-format={field.format} ? ""
              className={errclass+(field.className ? "")}
              placeholder={field.placeholder} />
         </label>
diff --git a/internal_packages/onboarding/lib/account-types.coffee b/internal_packages/onboarding/lib/account-types.coffee
index 29e900ca3..6be0325c1 100644
--- a/internal_packages/onboarding/lib/account-types.coffee
+++ b/internal_packages/onboarding/lib/account-types.coffee
@@ -125,6 +125,7 @@ Providers = [
         label: 'Port (optional)'
         className: 'half'
         default: 993
+        format: 'integer'
         page: 1
       }, {
         name: 'imap_ssl_enabled'
@@ -157,6 +158,7 @@ Providers = [
         placeholder: '587'
         label: 'Port (optional)'
         className: 'half'
+        format: 'integer'
         default: 587
         page: 2
       }, {

From 05ed20e539b41b69585804de0f933b1daef7a323 Mon Sep 17 00:00:00 2001
From: Drew Regitsky <drew@nylas.com>
Date: Fri, 2 Oct 2015 15:34:56 -0700
Subject: [PATCH 4/4] fix(welcome): small ui tweaks in welcome/onboarding

Summary: Change the white logo to have an inner shadow, and set to PreserveContent. Fix typo in welcome page. Tweak some text opacity for readability.

Test Plan: manual

Reviewers: evan, bengotow

Reviewed By: bengotow

Subscribers: bengotow

Differential Revision: https://phab.nylas.com/D2090
---
 .../onboarding/assets/nylas-pictographB@2x.png  | Bin 0 -> 16014 bytes
 .../onboarding/lib/account-choose-page.cjsx     |   2 +-
 .../onboarding/lib/welcome-page.cjsx            |   4 ++--
 .../onboarding/stylesheets/onboarding.less      |   8 +-------
 4 files changed, 4 insertions(+), 10 deletions(-)
 create mode 100644 internal_packages/onboarding/assets/nylas-pictographB@2x.png

diff --git a/internal_packages/onboarding/assets/nylas-pictographB@2x.png b/internal_packages/onboarding/assets/nylas-pictographB@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b9c73b61460274c67b0e971c3a2a5890f2bab10
GIT binary patch
literal 16014
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
Xjq;Bl#~g;i7|b4%gU0!WP7(hPe(01b

literal 0
HcmV?d00001

diff --git a/internal_packages/onboarding/lib/account-choose-page.cjsx b/internal_packages/onboarding/lib/account-choose-page.cjsx
index 3d42e4660..0e438c4fa 100644
--- a/internal_packages/onboarding/lib/account-choose-page.cjsx
+++ b/internal_packages/onboarding/lib/account-choose-page.cjsx
@@ -30,7 +30,7 @@ class AccountChoosePage extends React.Component
         <RetinaImg name="onboarding-close.png" mode={RetinaImg.Mode.ContentPreserve}/>
       </div>
 
-      <RetinaImg url="nylas://onboarding/assets/nylas-pictograph@2x.png" mode={RetinaImg.Mode.ContentIsMask} style={zoom: 0.29} className="logo"/>
+      <RetinaImg url="nylas://onboarding/assets/nylas-pictographB@2x.png" mode={RetinaImg.Mode.ContentPreserve} style={zoom: 0.29, opacity: 0.55} className="logo"/>
 
       <div className="caption" style={marginTop: 15, marginBottom:20}>Select your email provider</div>
 
diff --git a/internal_packages/onboarding/lib/welcome-page.cjsx b/internal_packages/onboarding/lib/welcome-page.cjsx
index 6d0125906..3439bb4f8 100644
--- a/internal_packages/onboarding/lib/welcome-page.cjsx
+++ b/internal_packages/onboarding/lib/welcome-page.cjsx
@@ -45,7 +45,7 @@ class WelcomePage extends React.Component
 
   _renderStep0: ->
     <div className={@_stepClass(0)} key="step-0">
-      <RetinaImg className="logo" style={zoom: 0.20, marginTop: 60} url="nylas://onboarding/assets/nylas-pictograph@2x.png" mode={RetinaImg.Mode.ContentIsMask} />
+      <RetinaImg className="logo" style={zoom: 0.20, marginTop: 60, opacity: 0.7} url="nylas://onboarding/assets/nylas-pictographB@2x.png" mode={RetinaImg.Mode.ContentPreserve}/>
       <p className="hero-text" style={marginTop: 30, fontSize: 44}>Say hello to N1.</p>
       <p className="sub-text" style={marginTop: 0, fontSize: 24}>The next-generation email platform.</p>
       <div style={fontSize:17, marginTop: 45}>Built with ❤︎ by Nylas</div>
@@ -65,7 +65,7 @@ class WelcomePage extends React.Component
       <RetinaImg className="wrench" mode={RetinaImg.Mode.ContentPreserve}
                  url="nylas://onboarding/assets/wrench@2x.png" />
 
-      <p className="sub-text">N1 is built with modern web technologies and easy to extend with JavaScript.</p>
+      <p className="sub-text">N1 is built with modern web technologies and is easy to extend with JavaScript.</p>
       {@_renderNavBubble(1)}
     </div>
 
diff --git a/internal_packages/onboarding/stylesheets/onboarding.less b/internal_packages/onboarding/stylesheets/onboarding.less
index 3a520734e..80d692eed 100644
--- a/internal_packages/onboarding/stylesheets/onboarding.less
+++ b/internal_packages/onboarding/stylesheets/onboarding.less
@@ -312,9 +312,6 @@
 .page.account-choose {
   width: 388px;
   height: 615px;
-  img.logo.content-mask {
-    background-color: rgba(255,255,255,0.4);
-  }
 
   .caption {
     font-size: 17px;
@@ -539,9 +536,6 @@
       line-height: 41px;
     }
 
-    img.logo.content-mask {
-      background-color: rgba(255,255,255,0.4);
-    }
     img.icons.content-mask {
       background-color: rgba(255,255,255,0.7);
     }
@@ -647,7 +641,7 @@
 
       p {
         margin-top: 1em;
-        color: rgba(255,255,255,0.7);
+        color: rgba(255,255,255,0.9);
         font-size: 17px;
         line-height: 24px;
       }