From 7a9e28cad7321cfe5ca7749370ad578340f9ea88 Mon Sep 17 00:00:00 2001
From: Dan <dan@a8c.com>
Date: Fri, 26 Jan 2018 17:28:13 -0800
Subject: [PATCH 1/9] sign out warning, still a WIP

---
 lib/dialogs/settings.jsx | 57 +++++++++++++++++++++++++++++++++++++++-
 package.json             | 12 ++++-----
 scss/settings.scss       |  7 +++++
 3 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/lib/dialogs/settings.jsx b/lib/dialogs/settings.jsx
index cb1c142a7..278d6fd3f 100644
--- a/lib/dialogs/settings.jsx
+++ b/lib/dialogs/settings.jsx
@@ -15,6 +15,12 @@ export const SettingsDialog = React.createClass({
     onSignOut: PropTypes.func.isRequired,
   },
 
+  getInitialState() {
+    return {
+      shouldShowSyncWarning: false,
+    };
+  },
+
   onDone() {
     this.props.actions.closeDialog({ key: this.props.dialog.key });
   },
@@ -37,6 +43,42 @@ export const SettingsDialog = React.createClass({
     });
   },
 
+  // TODO: fix.
+  hasUnsyncedNotes: function() {
+    let foundUnsynced = false;
+
+    this.props.appState.notes.some(note => {
+      this.props.noteBucket.getVersion(note.id, (e, version) => {
+        if (e || version >= 0) {
+          foundUnsynced = true;
+        }
+      });
+
+      return foundUnsynced === true;
+    });
+
+    return foundUnsynced;
+  },
+
+  onSignOutRequested: function() {
+    const { shouldShowSyncWarning } = this.state;
+    console.log(shouldShowSyncWarning); // eslint-disable-line no-console
+    // If user clicks on log out button a second time, sign out
+    if (shouldShowSyncWarning) {
+      this.setState({ shouldShowSyncWarning: false });
+      //this.props.onSignOut();
+      return;
+    }
+
+    // Safety first! Check for unsynced notes.
+    if (this.hasUnsyncedNotes()) {
+      console.log('UNSYNCED!'); // eslint-disable-line no-console
+      this.setState({ shouldShowSyncWarning: true });
+    } else {
+      //this.props.onSignOut();
+    }
+  },
+
   render() {
     var dialog = this.props.dialog;
 
@@ -75,6 +117,8 @@ export const SettingsDialog = React.createClass({
       },
     } = this.props;
 
+    const { shouldShowSyncWarning } = this.state;
+
     switch (tabName) {
       case 'account':
         return (
@@ -91,11 +135,22 @@ export const SettingsDialog = React.createClass({
                 <button
                   type="button"
                   className="button button-primary"
-                  onClick={this.props.onSignOut}
+                  onClick={this.onSignOutRequested}
                 >
                   Log Out
                 </button>
               </li>
+              {shouldShowSyncWarning && (
+                <div className="settings-unsynced-warning">
+                  <h3>Unsynced Notes Detected</h3>
+                  <p>
+                    Logging out may delete notes that have not synced. Check
+                    your connection and perhaps export your notes to ensure you
+                    don&apos;t lose any content. Click &apos;Log Out&apos; again
+                    to proceed logging out.
+                  </p>
+                </div>
+              )}
               <li>
                 <button
                   type="button"
diff --git a/package.json b/package.json
index c43488662..9d4255a67 100644
--- a/package.json
+++ b/package.json
@@ -14,19 +14,19 @@
     "build": "NODE_ENV=development npm run build:dll && npm run build:app",
     "build:app": "webpack --config ./webpack.config.js",
     "build:dll": "webpack --config ./webpack.config.dll.js",
-    "build:prod":
-      "NODE_ENV=production webpack -p --config ./webpack.config.dll.js && webpack -p --config ./webpack.config.js",
+    "build:prod": "NODE_ENV=production webpack -p --config ./webpack.config.dll.js && webpack -p --config ./webpack.config.js",
     "format": "prettier --write {desktop,lib,sass}/{**/,*}.{js,json,jsx,sass}",
     "lint": "eslint --ext .js --ext .jsx lib",
-    "start":
-      "NODE_ENV=hot npm run build && webpack-dev-server --config ./webpack.config.js --content-base dist --host 0.0.0.0 --port 4000 --hot --inline"
+    "start": "NODE_ENV=hot npm run build && webpack-dev-server --config ./webpack.config.js --content-base dist --host 0.0.0.0 --port 4000 --hot --inline"
   },
   "license": "ISC",
   "engines": {
     "node": "7.9.0",
     "npm": "4.2.0"
   },
-  "browserslist": ["Chrome >= 58"],
+  "browserslist": [
+    "Chrome >= 58"
+  ],
   "jest": {
     "rootDir": "lib",
     "testRegex": "(/test/.*\\.jsx?)|(test\\.jsx?)$"
@@ -99,7 +99,7 @@
     "serve-favicon": "2.4.3",
     "showdown": "1.7.2",
     "showdown-xss-filter": "0.2.0",
-    "simperium": "0.2.9"
+    "simperium": "0.3.0"
   },
   "optionalDependencies": {
     "appdmg": "0.4.5"
diff --git a/scss/settings.scss b/scss/settings.scss
index 91d55ecfc..bc829493b 100644
--- a/scss/settings.scss
+++ b/scss/settings.scss
@@ -28,6 +28,13 @@
   .settings-writing {
     padding-top: 48px;
   }
+
+  .settings-unsynced-warning {
+    h3 {
+      color: $red;
+      text-align: center;
+    }
+  }
 }
 
 .settings-group {

From 721ae54a880e4e72125ada0f4359b6fe0dcbd73b Mon Sep 17 00:00:00 2001
From: Dan Roundhill <dan@a8c.com>
Date: Mon, 29 Jan 2018 16:03:05 -0800
Subject: [PATCH 2/9] Adding a native dialog when on electron, otherwise a
 humble js `confirm()` dialog.

---
 lib/app.jsx              |   8 ++-
 lib/dialogs/settings.jsx | 102 +++++++++++++++++++++------------------
 2 files changed, 62 insertions(+), 48 deletions(-)

diff --git a/lib/app.jsx b/lib/app.jsx
index 8af19890d..3441d9618 100644
--- a/lib/app.jsx
+++ b/lib/app.jsx
@@ -517,7 +517,13 @@ export const App = connect(mapStateToProps, mapDispatchToProps)(
         throw new Error('Unknown dialog type.');
       }
 
-      return <DialogComponent {...this.props} {...{ key, dialog, params }} />;
+      return (
+        <DialogComponent
+          isElectron={isElectron()}
+          {...this.props}
+          {...{ key, dialog, params }}
+        />
+      );
     },
   })
 );
diff --git a/lib/dialogs/settings.jsx b/lib/dialogs/settings.jsx
index 278d6fd3f..7cdafb857 100644
--- a/lib/dialogs/settings.jsx
+++ b/lib/dialogs/settings.jsx
@@ -13,12 +13,7 @@ export const SettingsDialog = React.createClass({
   propTypes: {
     actions: PropTypes.object.isRequired,
     onSignOut: PropTypes.func.isRequired,
-  },
-
-  getInitialState() {
-    return {
-      shouldShowSyncWarning: false,
-    };
+    isElectron: PropTypes.bool.isRequired,
   },
 
   onDone() {
@@ -43,39 +38,65 @@ export const SettingsDialog = React.createClass({
     });
   },
 
-  // TODO: fix.
-  hasUnsyncedNotes: function() {
-    let foundUnsynced = false;
-
-    this.props.appState.notes.some(note => {
-      this.props.noteBucket.getVersion(note.id, (e, version) => {
-        if (e || version >= 0) {
-          foundUnsynced = true;
-        }
-      });
+  onSignOutRequested() {
+    // Safety first! Check for any unsynced notes before signing out.
+    // A note that hasn't synced has a version of 0
+    const { onSignOut } = this.props;
+    const { notes } = this.props.appState;
+    const { getVersion } = this.props.noteBucket;
+    const noteHasSynced = note =>
+      new Promise((resolve, reject) =>
+        getVersion(note.id, (e, v) => (e || v === 0 ? reject() : resolve()))
+      );
+
+    Promise.race(notes.map(noteHasSynced)).then(
+      () => onSignOut(), // All good, sign out now!
+      () => this.showUnsyncedWarning() // Show a warning to the user
+    );
+  },
 
-      return foundUnsynced === true;
-    });
+  showUnsyncedWarning() {
+    const { isElectron } = this.props;
+    if (isElectron) {
+      this.showElectronWarningDialog();
+    } else {
+      this.showWebWarningDialog();
+    }
+  },
 
-    return foundUnsynced;
+  showElectronWarningDialog() {
+    const { onSignOut } = this.props;
+    const dialog = __non_webpack_require__('electron').remote.dialog; // eslint-disable-line no-undef
+    dialog.showMessageBox(
+      {
+        type: 'warning',
+        buttons: ['Delete Notes', 'Cancel', 'Visit Web App'],
+        title: 'Unsynced Notes Detected',
+        message:
+          'Signing out will delete any unsynced notes. You can verify your ' +
+          'synced notes by signing in to the Web App.',
+      },
+      response => {
+        if (response === 0) {
+          onSignOut();
+        } else if (response === 2) {
+          viewExternalUrl('https://app.simplenote.com');
+        }
+      }
+    );
   },
 
-  onSignOutRequested: function() {
-    const { shouldShowSyncWarning } = this.state;
-    console.log(shouldShowSyncWarning); // eslint-disable-line no-console
-    // If user clicks on log out button a second time, sign out
-    if (shouldShowSyncWarning) {
-      this.setState({ shouldShowSyncWarning: false });
-      //this.props.onSignOut();
-      return;
-    }
+  showWebWarningDialog() {
+    const { onSignOut } = this.props;
+    const shouldReallySignOut = confirm(
+      'Warning: Unsynced notes were detected.\n\n' +
+        'Logging out will delete any notes that have not synced. ' +
+        'Check your connection and visit app.simplenote.com to verify synced notes.' +
+        '\n\nClick OK to delete unsynced notes and Log Out.'
+    );
 
-    // Safety first! Check for unsynced notes.
-    if (this.hasUnsyncedNotes()) {
-      console.log('UNSYNCED!'); // eslint-disable-line no-console
-      this.setState({ shouldShowSyncWarning: true });
-    } else {
-      //this.props.onSignOut();
+    if (shouldReallySignOut) {
+      onSignOut();
     }
   },
 
@@ -117,8 +138,6 @@ export const SettingsDialog = React.createClass({
       },
     } = this.props;
 
-    const { shouldShowSyncWarning } = this.state;
-
     switch (tabName) {
       case 'account':
         return (
@@ -140,17 +159,6 @@ export const SettingsDialog = React.createClass({
                   Log Out
                 </button>
               </li>
-              {shouldShowSyncWarning && (
-                <div className="settings-unsynced-warning">
-                  <h3>Unsynced Notes Detected</h3>
-                  <p>
-                    Logging out may delete notes that have not synced. Check
-                    your connection and perhaps export your notes to ensure you
-                    don&apos;t lose any content. Click &apos;Log Out&apos; again
-                    to proceed logging out.
-                  </p>
-                </div>
-              )}
               <li>
                 <button
                   type="button"

From 8abc96d40c2232e298bc540b62b5cbf0c113efb4 Mon Sep 17 00:00:00 2001
From: Dan Roundhill <dan@a8c.com>
Date: Mon, 29 Jan 2018 16:10:22 -0800
Subject: [PATCH 3/9] Removing some now-unused css.

---
 scss/settings.scss | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/scss/settings.scss b/scss/settings.scss
index bc829493b..91d55ecfc 100644
--- a/scss/settings.scss
+++ b/scss/settings.scss
@@ -28,13 +28,6 @@
   .settings-writing {
     padding-top: 48px;
   }
-
-  .settings-unsynced-warning {
-    h3 {
-      color: $red;
-      text-align: center;
-    }
-  }
 }
 
 .settings-group {

From 74929039c6ce03787fab7fde027bc6077e21144a Mon Sep 17 00:00:00 2001
From: Dan Roundhill <dan@a8c.com>
Date: Mon, 29 Jan 2018 16:12:49 -0800
Subject: [PATCH 4/9] Logging > Signing

---
 lib/dialogs/settings.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dialogs/settings.jsx b/lib/dialogs/settings.jsx
index 7cdafb857..4b52968d2 100644
--- a/lib/dialogs/settings.jsx
+++ b/lib/dialogs/settings.jsx
@@ -73,7 +73,7 @@ export const SettingsDialog = React.createClass({
         buttons: ['Delete Notes', 'Cancel', 'Visit Web App'],
         title: 'Unsynced Notes Detected',
         message:
-          'Signing out will delete any unsynced notes. You can verify your ' +
+          'Logging out will delete any unsynced notes. You can verify your ' +
           'synced notes by signing in to the Web App.',
       },
       response => {

From 12fddee92b4a39db214fb6be912ac9a5c5033edd Mon Sep 17 00:00:00 2001
From: Dan Roundhill <dan@a8c.com>
Date: Mon, 29 Jan 2018 16:16:19 -0800
Subject: [PATCH 5/9] Another update to `logging` vs `signing`.

---
 lib/dialogs/settings.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dialogs/settings.jsx b/lib/dialogs/settings.jsx
index 4b52968d2..9814f7859 100644
--- a/lib/dialogs/settings.jsx
+++ b/lib/dialogs/settings.jsx
@@ -74,7 +74,7 @@ export const SettingsDialog = React.createClass({
         title: 'Unsynced Notes Detected',
         message:
           'Logging out will delete any unsynced notes. You can verify your ' +
-          'synced notes by signing in to the Web App.',
+          'synced notes by logging in to the Web App.',
       },
       response => {
         if (response === 0) {

From 31926982115a0bb54361acefb5f65ee9623a7acb Mon Sep 17 00:00:00 2001
From: Dan Roundhill <dan@a8c.com>
Date: Tue, 6 Feb 2018 16:33:05 -0800
Subject: [PATCH 6/9] Adding support to check Simperium's new `hasLocalChanges`
 to see if there's any local modifications to notes before signing out.

---
 lib/dialogs/settings.jsx | 32 +++++++++++++++++++++-----------
 package.json             |  2 +-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/lib/dialogs/settings.jsx b/lib/dialogs/settings.jsx
index 9814f7859..79c951240 100644
--- a/lib/dialogs/settings.jsx
+++ b/lib/dialogs/settings.jsx
@@ -40,18 +40,28 @@ export const SettingsDialog = React.createClass({
 
   onSignOutRequested() {
     // Safety first! Check for any unsynced notes before signing out.
-    // A note that hasn't synced has a version of 0
-    const { onSignOut } = this.props;
+    const { onSignOut, noteBucket } = this.props;
     const { notes } = this.props.appState;
-    const { getVersion } = this.props.noteBucket;
-    const noteHasSynced = note =>
-      new Promise((resolve, reject) =>
-        getVersion(note.id, (e, v) => (e || v === 0 ? reject() : resolve()))
-      );
-
-    Promise.race(notes.map(noteHasSynced)).then(
-      () => onSignOut(), // All good, sign out now!
-      () => this.showUnsyncedWarning() // Show a warning to the user
+    const { getVersion } = noteBucket;
+
+    if (
+      noteBucket.hasLocalChanges((error, hasChanges) => {
+        if (hasChanges) {
+          this.showUnsyncedWarning();
+          return;
+        }
+
+        // Also check persisted store for any notes with version 0
+        const noteHasSynced = note =>
+          new Promise((resolve, reject) =>
+            getVersion(note.id, (e, v) => (e || v === 0 ? reject() : resolve()))
+          );
+
+        Promise.race(notes.map(noteHasSynced)).then(
+          () => onSignOut(), // All good, sign out now!
+          () => this.showUnsyncedWarning() // Show a warning to the user
+        );
+      })
     );
   },
 
diff --git a/package.json b/package.json
index 9d4255a67..f143c45e5 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "serve-favicon": "2.4.3",
     "showdown": "1.7.2",
     "showdown-xss-filter": "0.2.0",
-    "simperium": "0.3.0"
+    "simperium": "0.3.1"
   },
   "optionalDependencies": {
     "appdmg": "0.4.5"

From f68b6eb6a8f4eee36ab93ed85f4ed7ca3f4bc92a Mon Sep 17 00:00:00 2001
From: Dan Roundhill <dan@a8c.com>
Date: Tue, 6 Feb 2018 16:39:50 -0800
Subject: [PATCH 7/9] Changed an if statement to a ternary.

---
 lib/dialogs/settings.jsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/dialogs/settings.jsx b/lib/dialogs/settings.jsx
index 79c951240..ee0fe7cf9 100644
--- a/lib/dialogs/settings.jsx
+++ b/lib/dialogs/settings.jsx
@@ -67,11 +67,7 @@ export const SettingsDialog = React.createClass({
 
   showUnsyncedWarning() {
     const { isElectron } = this.props;
-    if (isElectron) {
-      this.showElectronWarningDialog();
-    } else {
-      this.showWebWarningDialog();
-    }
+    isElectron ? this.showElectronWarningDialog() : this.showWebWarningDialog();
   },
 
   showElectronWarningDialog() {

From d56399e35360430579aa3215d0cdca0fdb4e00ed Mon Sep 17 00:00:00 2001
From: Dan Roundhill <dan@a8c.com>
Date: Tue, 6 Feb 2018 17:11:54 -0800
Subject: [PATCH 8/9] Removing if statement, not needed with the callback in
 Simperium

---
 lib/dialogs/settings.jsx | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/lib/dialogs/settings.jsx b/lib/dialogs/settings.jsx
index ee0fe7cf9..57d285244 100644
--- a/lib/dialogs/settings.jsx
+++ b/lib/dialogs/settings.jsx
@@ -44,25 +44,23 @@ export const SettingsDialog = React.createClass({
     const { notes } = this.props.appState;
     const { getVersion } = noteBucket;
 
-    if (
-      noteBucket.hasLocalChanges((error, hasChanges) => {
-        if (hasChanges) {
-          this.showUnsyncedWarning();
-          return;
-        }
-
-        // Also check persisted store for any notes with version 0
-        const noteHasSynced = note =>
-          new Promise((resolve, reject) =>
-            getVersion(note.id, (e, v) => (e || v === 0 ? reject() : resolve()))
-          );
+    noteBucket.hasLocalChanges((error, hasChanges) => {
+      if (hasChanges) {
+        this.showUnsyncedWarning();
+        return;
+      }
 
-        Promise.race(notes.map(noteHasSynced)).then(
-          () => onSignOut(), // All good, sign out now!
-          () => this.showUnsyncedWarning() // Show a warning to the user
+      // Also check persisted store for any notes with version 0
+      const noteHasSynced = note =>
+        new Promise((resolve, reject) =>
+          getVersion(note.id, (e, v) => (e || v === 0 ? reject() : resolve()))
         );
-      })
-    );
+
+      Promise.race(notes.map(noteHasSynced)).then(
+        () => onSignOut(), // All good, sign out now!
+        () => this.showUnsyncedWarning() // Show a warning to the user
+      );
+    });
   },
 
   showUnsyncedWarning() {

From 5324686f7fac9ee884483208ad7499694aa024d3 Mon Sep 17 00:00:00 2001
From: Dan Roundhill <dan@a8c.com>
Date: Tue, 6 Feb 2018 17:48:04 -0800
Subject: [PATCH 9/9] Use Promise.all so that we iterate through all notes
 until a rejection occurs.

h/t @beaucollins
---
 lib/dialogs/settings.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dialogs/settings.jsx b/lib/dialogs/settings.jsx
index 57d285244..8bd654661 100644
--- a/lib/dialogs/settings.jsx
+++ b/lib/dialogs/settings.jsx
@@ -56,7 +56,7 @@ export const SettingsDialog = React.createClass({
           getVersion(note.id, (e, v) => (e || v === 0 ? reject() : resolve()))
         );
 
-      Promise.race(notes.map(noteHasSynced)).then(
+      Promise.all(notes.map(noteHasSynced)).then(
         () => onSignOut(), // All good, sign out now!
         () => this.showUnsyncedWarning() // Show a warning to the user
       );