From 101dc21534cff938bea0f623caa47b68b32ed0d3 Mon Sep 17 00:00:00 2001
From: Jack Mallers <jimmymowschess@gmail.com>
Date: Mon, 11 Jun 2018 19:59:41 -0500
Subject: [PATCH 1/2] fix(connection-type): improve connection type copy

---
 app/components/Onboarding/ConnectionType.js | 9 +--------
 app/components/Onboarding/Login.js          | 2 +-
 app/components/Onboarding/Onboarding.js     | 4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/components/Onboarding/ConnectionType.js b/app/components/Onboarding/ConnectionType.js
index 2a1a8a2c..6e188471 100644
--- a/app/components/Onboarding/ConnectionType.js
+++ b/app/components/Onboarding/ConnectionType.js
@@ -8,11 +8,7 @@ const ConnectionType = ({ connectionType, setConnectionType }) => (
     <section className={`${styles.option} ${connectionType === 'local' && styles.active}`}>
       <div className={`${styles.button}`} onClick={() => setConnectionType('local')}>
         {connectionType === 'local' ? <FaCircle /> : <FaCircleThin />}
-        <span className={styles.label}>Automatic</span>
-      </div>
-      <div className={`${styles.description}`}>
-        In automatic mode, we will check your local machine to see if you already have a Lightning node running.
-        If so, we will try to use it. If not, we will start up a light-weight neutrino node for you.
+        <span className={styles.label}>Default</span>
       </div>
     </section>
     <section className={`${styles.option} ${connectionType === 'custom' && styles.active}`}>
@@ -20,9 +16,6 @@ const ConnectionType = ({ connectionType, setConnectionType }) => (
         {connectionType === 'custom' ? <FaCircle /> : <FaCircleThin />}
         <span className={styles.label}>Custom</span>
       </div>
-      <div className={`${styles.description}`}>
-        Connect to a remote Lightning node or a node running in a non-standard location (advanced users only).
-      </div>
     </section>
   </div>
 )
diff --git a/app/components/Onboarding/Login.js b/app/components/Onboarding/Login.js
index a02d5a8d..0b8e0752 100644
--- a/app/components/Onboarding/Login.js
+++ b/app/components/Onboarding/Login.js
@@ -29,7 +29,7 @@ const Login = ({
             unlockingWallet ?
               <i className={styles.spinner} />
               :
-              'Log In'
+              'Unlock'
           }
         </span>
       </div>
diff --git a/app/components/Onboarding/Onboarding.js b/app/components/Onboarding/Onboarding.js
index dfece9e7..a345e1c3 100644
--- a/app/components/Onboarding/Onboarding.js
+++ b/app/components/Onboarding/Onboarding.js
@@ -51,8 +51,8 @@ const Onboarding = ({
       case 0.1:
         return (
           <FormContainer
-            title='Lightning Connection'
-            description='How will you connect to the Lightning Network?'
+            title='How do you want to connect to the Lightning Network?'
+            description='By default Zap will spin up a node for you and handle all the nerdy stuff in the background. However you can also setup a custom node connection and use Zap to control a remote node if you desire (for advanced users).'
             back={null}
             next={() => changeStep(connectionType === 'local' ? 1 : 0.2)}
           >

From 42344065f4e1253c40adbaff338b659ee6fea574 Mon Sep 17 00:00:00 2001
From: Jack Mallers <jimmymowschess@gmail.com>
Date: Mon, 11 Jun 2018 20:09:01 -0500
Subject: [PATCH 2/2] fix(lint): fix lint errors

---
 app/components/Onboarding/Onboarding.js |  6 +++++-
 app/lnd/methods/index.js                | 10 ++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/components/Onboarding/Onboarding.js b/app/components/Onboarding/Onboarding.js
index a345e1c3..4587eb70 100644
--- a/app/components/Onboarding/Onboarding.js
+++ b/app/components/Onboarding/Onboarding.js
@@ -52,7 +52,11 @@ const Onboarding = ({
         return (
           <FormContainer
             title='How do you want to connect to the Lightning Network?'
-            description='By default Zap will spin up a node for you and handle all the nerdy stuff in the background. However you can also setup a custom node connection and use Zap to control a remote node if you desire (for advanced users).'
+            description='
+              By default Zap will spin up a node for you and handle all the nerdy stuff
+              in the background. However you can also setup a custom node connection and
+              use Zap to control a remote node if you desire (for advanced users).
+            '
             back={null}
             next={() => changeStep(connectionType === 'local' ? 1 : 0.2)}
           >
diff --git a/app/lnd/methods/index.js b/app/lnd/methods/index.js
index a7ed3230..8ec64116 100644
--- a/app/lnd/methods/index.js
+++ b/app/lnd/methods/index.js
@@ -128,7 +128,7 @@ export default function (lnd, event, msg, data) {
         .then(newinvoice =>
           invoicesController
             .getInvoice(lnd, { pay_req: newinvoice.payment_request })
-            .then(decodedInvoice => {
+            .then(decodedInvoice =>
               event.sender.send(
                 'createdInvoice',
                 Object.assign(decodedInvoice, {
@@ -138,13 +138,11 @@ export default function (lnd, event, msg, data) {
                   payment_request: newinvoice.payment_request,
                   creation_date: Date.now() / 1000
                 })
-              )
-            })
-            .catch(error => {
+              ))
+            .catch((error) => {
               console.log('decodedInvoice error: ', error)
               event.sender.send('invoiceFailed', { error: error.toString() })
-            })
-        )
+            }))
         .catch((error) => {
           console.log('addInvoice error: ', error)
           event.sender.send('invoiceFailed', { error: error.toString() })