From 6fbad58251dce0d3b68e44939720fcd719d182dd Mon Sep 17 00:00:00 2001
From: Guy Lepage <guylepage3@gmail.com>
Date: Tue, 31 Oct 2017 09:13:53 -0400
Subject: [PATCH 01/24] update to buttons #788

---
 app/js/wallet/SendPage.js |  2 +-
 app/styles/app.css        | 45 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/app/js/wallet/SendPage.js b/app/js/wallet/SendPage.js
index a4b305aee..6fab7034a 100644
--- a/app/js/wallet/SendPage.js
+++ b/app/js/wallet/SendPage.js
@@ -177,7 +177,7 @@ class SendPage extends Component {
             required
           />
           <div className="m-t-40 m-b-75">
-            <button className="btn btn-dark btn-block" type="submit" disabled={disabled}>
+            <button className="btn btn-primary btn-block" type="submit" disabled={disabled}>
               {disabled ?
                 <span>Sending...</span>
               :
diff --git a/app/styles/app.css b/app/styles/app.css
index 19c929786..c7df26eda 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -1,7 +1,7 @@
 /* Styles */
 
 /* Custom styles */
-.body-main{width:100%;height:100%;padding-top: 100px;}
+.body-main{width:100%;height:100%;padding-top:100px;}
 .body-landing{width:100%;height:100%;}
 .body-inner{width:100%;height:100%;}
 .bkg-light{background-color:#FAFAFA;}
@@ -412,11 +412,39 @@ h3{font-family:'Lato',sans-serif;font-size:1.25rem;font-weight:400;}
 
 /* 12. Buttons */
 button{outline:none!important;background-color:transparent;font-size:11px;cursor:pointer;}
-.btn{font-family:'Lato',sans-serif;padding:0.5625rem 2.5rem;font-size:0.8125rem;font-weight:700;line-height:1.75rem;border-radius:0!important;text-transform:uppercase;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-ms-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-box-shadow:0px 0px 25px 0px rgba(0,0,0,0.08);-moz-box-shadow:0px 0px 25px 0px rgba(0,0,0,0.08);box-shadow:0px 0px 25px 0px rgba(0,0,0,0.08);}
+.btn {
+  font-family: 'Lato', sans-serif;
+  padding: 0.75rem 2.5rem;
+  font-size: 0.8125rem;
+  font-weight: 900;
+  letter-spacing: 1px;
+  line-height: 1.75rem;
+  border-radius: 2px;
+  text-transform: uppercase;
+  -webkit-transition: all .2s ease-in-out;
+  -moz-transition: all .2s ease-in-out;
+  -ms-transition: all .2s ease-in-out;
+  -o-transition: all .2s ease-in-out;
+  transition: all .2s ease-in-out;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  -webkit-box-shadow: 0px 0px 25px 0px rgba(0, 0, 0, 0.08);
+  -moz-box-shadow: 0px 0px 25px 0px rgba(0, 0, 0, 0.08);
+  box-shadow: 0px 0px 25px 0px rgba(0, 0, 0, 0.08);
+}
 .btn-xs{font-size:0.75rem;padding:0.375rem 2.125rem;line-height:1rem;}
 .btn-sm{font-size:0.75rem;padding:0.375rem 2.125rem;line-height:1.5rem;}
-.btn-lg{font-size:0.875rem;padding:0.6875rem 3.4375rem;line-height:1.75rem;}
-.btn:focus,.btn:active:focus,.btn.active:focus{outline:none;}
+.btn-lg {
+  font-size: 0.8125rem;
+  padding: 1rem 3.4375rem;
+  line-height: 1.75rem;
+}
+
+.btn:focus, .btn:active:focus, .btn.active:focus {
+  outline: none;
+}
 .btn-primary{background-color:#2C96FF;border:1px solid #2C96FF;}
 .btn-link{color:#222222;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn-link:focus,.btn-link:hover{color:#2C96FF;text-decoration:none;}
@@ -425,7 +453,14 @@ button{outline:none!important;background-color:transparent;font-size:11px;cursor
 .btn-link-mute{color:#949494;}
 .btn-light{background-color:#fff;border-color:#fff;color:#2C96FF;}
 .btn-dark{color:#fff;background-color:#222222;}
-.btn-storage{background-color:#2C96FF;border:1px solid #2C96FF;margin-bottom:-15px;-webkit-box-shadow:0px 0px 25px 0px rgba(0,0,0,0.15);-moz-box-shadow:0px 0px 25px 0px rgba(0,0,0,0.15);box-shadow:0px 0px 25px 0px rgba(0,0,0,0.15);}
+.btn-storage {
+  background-color: #2C96FF;
+  border: 1px solid #2C96FF;
+  margin-bottom: -15px;
+  -webkit-box-shadow: 0px 0px 25px 0px rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: 0px 0px 25px 0px rgba(0, 0, 0, 0.15);
+  box-shadow: 0px 0px 25px 0px rgba(0, 0, 0, 0.15);
+}
 .btn-storage:hover{background-color:#0668BF;}
 .btn.disabled.btn-storage,.btn:disabled.btn-storage{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:#8CC3F4;border:1px solid #8CC3F4;}
 .btn-verify{font-size:0.65rem;padding:0.375rem 2.125rem;line-height:2rem;color:#fff;background-color:#222222;border:1px solid #fff;}

From 254273887cd16cfb4ab2e399668e94179488717e Mon Sep 17 00:00:00 2001
From: Guy Lepage <guylepage3@gmail.com>
Date: Tue, 31 Oct 2017 09:52:00 -0400
Subject: [PATCH 02/24] update to buttons #788

---
 app/js/account/CreateAccountPage.js           |  2 +-
 .../account/components/DeleteAccountModal.js  |  2 +-
 app/js/profiles/ImportProfilePage.js          |  2 +-
 app/js/profiles/ZoneFilePage.js               |  2 +-
 .../registration/RegistrationSearchBox.js     |  2 +-
 .../registration/RegistrationSearchResults.js |  8 +--
 .../registration/RegistrationSelectView.js    |  6 +-
 app/styles/app.css                            | 72 +++++++------------
 8 files changed, 37 insertions(+), 59 deletions(-)

diff --git a/app/js/account/CreateAccountPage.js b/app/js/account/CreateAccountPage.js
index 19fffd7b7..997dfd626 100644
--- a/app/js/account/CreateAccountPage.js
+++ b/app/js/account/CreateAccountPage.js
@@ -102,7 +102,7 @@ class CreateAccountPage extends Component {
                 <div className="form-group">
                   <fieldset>
                     <div className="col-xs-offset-3 col-xs-8 pull-right m-t-11 m-b-5">
-                      <button className="btn btn-block btn-secondary" onClick={this.createAccount}>
+                      <button className="btn btn-block btn-tertiary" onClick={this.createAccount}>
                         Create Account
                       </button>
                     </div>
diff --git a/app/js/account/components/DeleteAccountModal.js b/app/js/account/components/DeleteAccountModal.js
index 284cd3bbd..4d4331eb7 100644
--- a/app/js/account/components/DeleteAccountModal.js
+++ b/app/js/account/components/DeleteAccountModal.js
@@ -28,7 +28,7 @@ const DeleteAccountModal = (props) => (
       </button>
       <button
         onClick={props.closeModal}
-        className="btn btn-secondary btn-block"
+        className="btn btn-tertiary btn-block"
       >
         Cancel
       </button>
diff --git a/app/js/profiles/ImportProfilePage.js b/app/js/profiles/ImportProfilePage.js
index 4555d4f2b..5f041086f 100644
--- a/app/js/profiles/ImportProfilePage.js
+++ b/app/js/profiles/ImportProfilePage.js
@@ -61,7 +61,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(ImportPage)
 
 /*
   <div>
-    <button className="btn btn-secondary" onClick={this.refreshAddress}>
+    <button className="btn btn-tertiary" onClick={this.refreshAddress}>
       New Address
     </button>
   </div>
diff --git a/app/js/profiles/ZoneFilePage.js b/app/js/profiles/ZoneFilePage.js
index b3c6bae1f..7bd2c7958 100644
--- a/app/js/profiles/ZoneFilePage.js
+++ b/app/js/profiles/ZoneFilePage.js
@@ -234,7 +234,7 @@ class ZoneFilePage extends Component {
                     Broadcast update
                   </button>
                   <button
-                    className="btn btn-sm btn-secondary"
+                    className="btn btn-sm btn-tertiary"
                     onClick={this.reset}
                     disabled={this.state.disabled}
                     title="Reset your edits to the current zone file."
diff --git a/app/js/profiles/components/registration/RegistrationSearchBox.js b/app/js/profiles/components/registration/RegistrationSearchBox.js
index 2944a3c03..e6bfc59d8 100644
--- a/app/js/profiles/components/registration/RegistrationSearchBox.js
+++ b/app/js/profiles/components/registration/RegistrationSearchBox.js
@@ -45,7 +45,7 @@ const RegistrationSearchBox = (props) =>
 
         <Link
           to="/profiles"
-          className="btn btn-secondary btn-block"
+          className="btn btn-tertiary btn-block"
         >
           Cancel
         </Link>
diff --git a/app/js/profiles/components/registration/RegistrationSearchResults.js b/app/js/profiles/components/registration/RegistrationSearchResults.js
index 70bc670f2..a8f4f5229 100644
--- a/app/js/profiles/components/registration/RegistrationSearchResults.js
+++ b/app/js/profiles/components/registration/RegistrationSearchResults.js
@@ -38,7 +38,7 @@ const RegistrationSearchResults = (props) => (
                 <h4>Checking {name}...</h4>
                 <Link
                   to="/profiles"
-                  className="btn btn-secondary btn-block"
+                  className="btn btn-tertiary btn-block"
                 >
                   Cancel
                 </Link>
@@ -58,7 +58,7 @@ const RegistrationSearchResults = (props) => (
                         </Link>
                         <Link
                           to={`/profiles/i/add-username/${this.state.index}/search`}
-                          className="btn btn-secondary btn-block"
+                          className="btn btn-tertiary btn-block"
                         >
                           Cancel
                         </Link>
@@ -88,7 +88,7 @@ const RegistrationSearchResults = (props) => (
                           </Link>
                           <button
                             onClick={props.showSearchBox}
-                            className="btn btn-secondary btn-block"
+                            className="btn btn-tertiary btn-block"
                           >
                             Back
                           </button>
@@ -109,7 +109,7 @@ const RegistrationSearchResults = (props) => (
                     </button>
                     <button
                       onClick={props.showSearchBox}
-                      className="btn btn-secondary btn-block"
+                      className="btn btn-tertiary btn-block"
                     >
                       Back
                     </button>
diff --git a/app/js/profiles/components/registration/RegistrationSelectView.js b/app/js/profiles/components/registration/RegistrationSelectView.js
index e90a33efb..71fec0cba 100644
--- a/app/js/profiles/components/registration/RegistrationSelectView.js
+++ b/app/js/profiles/components/registration/RegistrationSelectView.js
@@ -284,7 +284,7 @@ class AddUsernameSelectPage extends Component {
                   :
                   <Link
                     to={`/profiles/i/add-username/${identityIndex}/search`}
-                    className="btn btn-secondary btn-block"
+                    className="btn btn-tertiary btn-block"
                   >
                     Back
                   </Link>
@@ -330,7 +330,7 @@ class AddUsernameSelectPage extends Component {
                   :
                   <Link
                     to={`/profiles/i/add-username/${identityIndex}/search`}
-                    className="btn btn-secondary btn-block"
+                    className="btn btn-tertiary btn-block"
                   >
                     Back
                   </Link>
@@ -369,7 +369,7 @@ class AddUsernameSelectPage extends Component {
                 </div>
                 <Link
                   to={`/profiles/i/add-username/${identityIndex}/search`}
-                  className="btn btn-secondary btn-block"
+                  className="btn btn-tertiary btn-block"
                 >
                   Back
                 </Link>
diff --git a/app/styles/app.css b/app/styles/app.css
index c7df26eda..4a40a802a 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -412,61 +412,39 @@ h3{font-family:'Lato',sans-serif;font-size:1.25rem;font-weight:400;}
 
 /* 12. Buttons */
 button{outline:none!important;background-color:transparent;font-size:11px;cursor:pointer;}
-.btn {
-  font-family: 'Lato', sans-serif;
-  padding: 0.75rem 2.5rem;
-  font-size: 0.8125rem;
-  font-weight: 900;
-  letter-spacing: 1px;
-  line-height: 1.75rem;
-  border-radius: 2px;
-  text-transform: uppercase;
-  -webkit-transition: all .2s ease-in-out;
-  -moz-transition: all .2s ease-in-out;
-  -ms-transition: all .2s ease-in-out;
-  -o-transition: all .2s ease-in-out;
-  transition: all .2s ease-in-out;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  -webkit-box-shadow: 0px 0px 25px 0px rgba(0, 0, 0, 0.08);
-  -moz-box-shadow: 0px 0px 25px 0px rgba(0, 0, 0, 0.08);
-  box-shadow: 0px 0px 25px 0px rgba(0, 0, 0, 0.08);
-}
+.btn{font-family:'Lato',sans-serif;padding:0.75rem 2.5rem 0.6875rem 2.5rem;font-size:0.8125rem;font-weight:900;line-height:1.75rem;border-radius:2px;-webkit-border-radius:2px;-moz-border-radius:2px;text-transform:uppercase;letter-spacing:1px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;}
+.btn:hover,.btn:focus,.btn:active{-webkit-box-shadow:0px 5px 20px 0px rgba(0,0,0,0.25);box-shadow:0px 5px 20px 0px rgba(0,0,0,0.25);}
 .btn-xs{font-size:0.75rem;padding:0.375rem 2.125rem;line-height:1rem;}
 .btn-sm{font-size:0.75rem;padding:0.375rem 2.125rem;line-height:1.5rem;}
-.btn-lg {
-  font-size: 0.8125rem;
-  padding: 1rem 3.4375rem;
-  line-height: 1.75rem;
-}
-
-.btn:focus, .btn:active:focus, .btn.active:focus {
-  outline: none;
-}
-.btn-primary{background-color:#2C96FF;border:1px solid #2C96FF;}
+.btn-lg{font-size:0.8125rem;padding:1rem 3.4375rem;line-height:1.75rem;}
+.btn-pill{border-radius:30px;-webkit-border-radius:30px;}
+.btn:focus,.btn:active:focus,.btn.active:focus{outline:none;}
+.btn-primary{color:#fff;border:1px solid #2C96FF;background-color:#2C96FF;}
+.btn-primary:hover,.btn-primary:focus,.btn-primary:active{color:#fff;background-color:#2378CC;border:1px solid #2378CC;font-weight:700;}
+.btn-secondary{color:#fff;background-color:#270F34;border:1px solid #270F34;}
+.btn-secondary:hover,.btn-secondary:focus,.btn-secondary:active{color:#fff;background-color:#2C96FF;border:1px solid #2C96FF;font-weight:700;}
+.btn-light{color:#212529;background-color:#fff;border:1px solid #fff;}
+.btn-light:hover,.btn-light:focus,.btn-light:active{color:#fff;background-color:#2C96FF;border:1px solid #2C96FF;font-weight:700;}
+.btn-outline-secondary{color:#fff;border:1px solid rgba(255,255,255,0.15);font-weight:700;background-color:#270F34;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;}
+.btn-outline-secondary:hover,.btn-outline-primary:focus,.btn-outline-primary:active{color:#270F34!important;border:1px solid rgba(255,255,255,1)!important;font-weight:700;background-color:#fff;outline:none;}
+.btn-outline-light{color:#fff;background-color:transparent;border:1px solid #fff;}
+.btn-outline-light:hover,.btn-outline-light:focus,.btn-outline-light:active{color:#fff;background-color:#2C96FF;border:1px solid #2C96FF;font-weight:700;}
+.btn-outline-alpha-light{color:#fff;background-color:transparent;border:1px solid rgba(255,255,255,0.25);}
+.btn-outline-alpha-light:hover,.btn-outline-alpha-light:focus,.btn-outline-alpha-light:active{color:#212529;background-color:#fff;border:1px solid #fff;font-weight:700;}
+.btn-tertiary{color:#fff;border:1px solid #AEAEAE;font-weight:700;background-color:#AEAEAE;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;}
+.btn-tertiary:hover,.btn-tertiary:focus,.btn-tertiary:active{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:#7B7B7B;border: 1px solid #7B7B7B;}
+.btn-dark,.btn-verify{color:#fff;background-color:#222222;}
 .btn-link{color:#222222;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-.btn-link:focus,.btn-link:hover{color:#2C96FF;text-decoration:none;}
+.btn-link:focus,.btn-link:hover{color:#2C96FF;text-decoration:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn-link.active{color:#2C96FF;text-decoration:none;}
 .btn-link-secondary{color:#222222;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn-link-mute{color:#949494;}
-.btn-light{background-color:#fff;border-color:#fff;color:#2C96FF;}
-.btn-dark{color:#fff;background-color:#222222;}
-.btn-storage {
-  background-color: #2C96FF;
-  border: 1px solid #2C96FF;
-  margin-bottom: -15px;
-  -webkit-box-shadow: 0px 0px 25px 0px rgba(0, 0, 0, 0.15);
-  -moz-box-shadow: 0px 0px 25px 0px rgba(0, 0, 0, 0.15);
-  box-shadow: 0px 0px 25px 0px rgba(0, 0, 0, 0.15);
-}
+.btn-storage{background-color:#2C96FF;border:1px solid #2C96FF;margin-bottom:-15px;-webkit-box-shadow:0px 0px 25px 0px rgba(0,0,0,0.15);-moz-box-shadow:0px 0px 25px 0px rgba(0,0,0,0.15);box-shadow:0px 0px 25px 0px rgba(0,0,0,0.15);}
 .btn-storage:hover{background-color:#0668BF;}
-.btn.disabled.btn-storage,.btn:disabled.btn-storage{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:#8CC3F4;border:1px solid #8CC3F4;}
-.btn-verify{font-size:0.65rem;padding:0.375rem 2.125rem;line-height:2rem;color:#fff;background-color:#222222;border:1px solid #fff;}
+.btn.disabled.btn-storage,.btn:disabled.btn-storage{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:#AEAEAE;border:1px solid #AEAEAE;}
 .btn-thin{line-height:1.0rem;padding:0px;}
-.btn-clipboard {width:40px;height:40px;color:#494F56;padding:0;border:0;}
-.storage-page button:disabled {cursor: default;}
+.btn-clipboard{width:40px;height:40px;color:#494F56;padding:0;border:0;}
+.storage-page button:disabled{cursor:default;}
 
 
 /* 13. Forms */

From 4db35556d2ed4fcd3c7ad236b2e5919cd142aba8 Mon Sep 17 00:00:00 2001
From: Guy Lepage <guylepage3@gmail.com>
Date: Thu, 2 Nov 2017 17:07:04 -0400
Subject: [PATCH 03/24] gst

---
 app/js/components/SecondaryNavBar.js  |  6 +++---
 app/js/profiles/DefaultProfilePage.js | 21 +++++++++++----------
 app/styles/app.css                    | 14 ++++++++++++++
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/app/js/components/SecondaryNavBar.js b/app/js/components/SecondaryNavBar.js
index 1ebbbbfa4..57055a6a3 100644
--- a/app/js/components/SecondaryNavBar.js
+++ b/app/js/components/SecondaryNavBar.js
@@ -53,7 +53,7 @@ class SecondaryNavBar extends Component {
   render() {
     const activeClass = this.props.activeClass ? this.props.activeClass : ""
     return (
-      <div className="container-fluid secondary-nav no-padding">
+      <div className="container-xs secondary-nav mx-auto">
         <div className="row">
           <div className="col">
             {this.props.leftButtonTitle !== undefined && (
@@ -102,7 +102,7 @@ class SecondaryNavBar extends Component {
               title={this.props.rightButtonTitle}
               onClick={this.props.onRightButtonClick}
               align="right"
-              isActive={this.props.isRightActive} 
+              isActive={this.props.isRightActive}
               activeClass={activeClass}
             />
             :
@@ -111,7 +111,7 @@ class SecondaryNavBar extends Component {
               link={this.props.rightButtonLink}
               align="right"
               isActive={this.props.isRightActive}
-              activeClass={activeClass} 
+              activeClass={activeClass}
             />
             ) }
           </div>
diff --git a/app/js/profiles/DefaultProfilePage.js b/app/js/profiles/DefaultProfilePage.js
index 56c2e283b..7b5581bda 100644
--- a/app/js/profiles/DefaultProfilePage.js
+++ b/app/js/profiles/DefaultProfilePage.js
@@ -602,15 +602,6 @@ class DefaultProfilePage extends Component {
           </div>
         </ToolTip>
         <div>
-          <SecondaryNavBar
-            leftButtonTitle={this.state.editMode ? 'Save' : 'Edit'}
-            leftIsButton
-            onLeftButtonClick={this.state.editMode ? this.onSaveClick : this.onEditClick}
-            rightButtonTitle={this.state.editMode ? 'Cancel' : 'More'}
-            rightIsButton={this.state.editMode}
-            onRightButtonClick={this.state.editMode ? this.onCancelClick : null}
-            rightButtonLink={this.state.editMode ? '' : '/profiles/i/all'}
-          />
 
           {profileCompleteness < 1 &&
             <ProfileCompletion completePct={profileCompleteness} />
@@ -706,7 +697,7 @@ class DefaultProfilePage extends Component {
                     </div>
 
                     <div className="pro-card-body text-center m-b-25">
-                      {(person.description() && person.description().length > 0) ? 
+                      {(person.description() && person.description().length > 0) ?
                         person.description() :
                         <span className="placeholder">Add your bio</span>}
                       <span className="pro-card-edit">
@@ -756,6 +747,16 @@ class DefaultProfilePage extends Component {
             </div>
           </div>
 
+          <SecondaryNavBar
+            leftButtonTitle={this.state.editMode ? 'Save' : 'Edit'}
+            leftIsButton
+            onLeftButtonClick={this.state.editMode ? this.onSaveClick : this.onEditClick}
+            rightButtonTitle={this.state.editMode ? 'Cancel' : 'More'}
+            rightIsButton={this.state.editMode}
+            onRightButtonClick={this.state.editMode ? this.onCancelClick : null}
+            rightButtonLink={this.state.editMode ? '' : '/profiles/i/all'}
+          />
+
           <div className="container-fluid p-0">
             <div className="row m-t-30 no-gutters">
               <div className="col">
diff --git a/app/styles/app.css b/app/styles/app.css
index c204ed002..44c3c25ec 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -429,6 +429,20 @@ button{outline:none!important;background-color:transparent;font-size:11px;cursor
 .btn-outline-secondary:hover,.btn-outline-primary:focus,.btn-outline-primary:active{color:#270F34!important;border:1px solid rgba(255,255,255,1)!important;font-weight:700;background-color:#fff;outline:none;}
 .btn-outline-light{color:#fff;background-color:transparent;border:1px solid #fff;}
 .btn-outline-light:hover,.btn-outline-light:focus,.btn-outline-light:active{color:#fff;background-color:#2C96FF;border:1px solid #2C96FF;font-weight:700;}
+
+.btn-outline-dark {
+  color: #2e2e2e;
+  background-color: transparent;
+  border: 1px solid #2e2e2e;
+}
+
+.btn-outline-dark:hover, .btn-outline-dark:focus, .btn-outline-dark:active {
+  color: #fff;
+  background-color: #2C96FF;
+  border: 1px solid #2C96FF;
+  font-weight: 700;
+}
+
 .btn-outline-alpha-light{color:#fff;background-color:transparent;border:1px solid rgba(255,255,255,0.25);}
 .btn-outline-alpha-light:hover,.btn-outline-alpha-light:focus,.btn-outline-alpha-light:active{color:#212529;background-color:#fff;border:1px solid #fff;font-weight:700;}
 .btn-tertiary{color:#fff;border:1px solid #AEAEAE;font-weight:700;background-color:#AEAEAE;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;}

From aea44e5f5d40c67207e5f123ece9aad3e379195e Mon Sep 17 00:00:00 2001
From: Guy Lepage <guylepage3@gmail.com>
Date: Thu, 2 Nov 2017 17:07:51 -0400
Subject: [PATCH 04/24] update to spacing, buttons, widths, etc to profiles,
 secondary nav #984

---
 app/js/components/SecondaryNavBar.js            |  8 ++++----
 app/js/profiles/DefaultProfilePage.js           |  6 +++---
 app/js/profiles/components/ProfileCompletion.js |  2 +-
 app/styles/app.css                              | 12 +++++++-----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/js/components/SecondaryNavBar.js b/app/js/components/SecondaryNavBar.js
index 57055a6a3..92ae395d2 100644
--- a/app/js/components/SecondaryNavBar.js
+++ b/app/js/components/SecondaryNavBar.js
@@ -8,7 +8,7 @@ const SecondaryNavLink = props => {
 
   return (
     <Link
-      className={`btn btn-link btn-block ${alignment} ${active}`}
+      className={`btn btn-outline-dark btn-pill btn-sm ${active}`}
       to={props.link}>
       {props.title}
     </Link>
@@ -21,7 +21,7 @@ const SecondaryNavButton = props => {
 
   return (
     <button
-      className={`btn btn-link btn-block ${alignment} ${active}`}
+      className={`btn btn-outline-dark btn-pill btn-sm ${active}`}
       title={props.title}
       onClick={props.onClick}>
       {props.title}
@@ -55,7 +55,7 @@ class SecondaryNavBar extends Component {
     return (
       <div className="container-xs secondary-nav mx-auto">
         <div className="row">
-          <div className="col">
+          <div className="col text-center">
             {this.props.leftButtonTitle !== undefined && (
               this.props.leftIsButton ?
               <SecondaryNavButton
@@ -95,7 +95,7 @@ class SecondaryNavBar extends Component {
               />
           )}
           </div>
-          <div className="col">
+          <div className="col text-center">
           {this.props.rightButtonTitle !== undefined && (
             this.props.rightIsButton ?
             <SecondaryNavButton
diff --git a/app/js/profiles/DefaultProfilePage.js b/app/js/profiles/DefaultProfilePage.js
index 7b5581bda..27a8204d5 100644
--- a/app/js/profiles/DefaultProfilePage.js
+++ b/app/js/profiles/DefaultProfilePage.js
@@ -732,8 +732,8 @@ class DefaultProfilePage extends Component {
             <div className="row">
               <div className="col-12">
 
-                <div className="pro-card-trust-level text-center m-t-25 m-b-30">
-                  <span className="pro-card-trust-level-badge">
+                <div className="container-fluid text-center m-t-25 m-b-40" >
+                  <span className="btn btn-dark btn-pill btn-xs" style={{ boxShadow: 'none' }} >
                     {trustLevel >= 3 && <i className="fa fa-lg fa-check-circle" />}
                     <span className="pro-card-trust-level">Trust Level: {trustLevel} </span>
                     {trustLevel <= 1 &&
@@ -758,7 +758,7 @@ class DefaultProfilePage extends Component {
           />
 
           <div className="container-fluid p-0">
-            <div className="row m-t-30 no-gutters">
+            <div className="row m-t-50 no-gutters">
               <div className="col">
                 <div className="profile-accounts">
                   <ul>
diff --git a/app/js/profiles/components/ProfileCompletion.js b/app/js/profiles/components/ProfileCompletion.js
index 28e09e9db..52fdd00a5 100644
--- a/app/js/profiles/components/ProfileCompletion.js
+++ b/app/js/profiles/components/ProfileCompletion.js
@@ -9,7 +9,7 @@ class ProfileCompletion extends Component {
   render() {
     const pct = this.props.completePct*100
     return (
-      <div className="container-fluid m-t-35 p-0">
+      <div className="container-fluid p-0">
         <div className="row">
           <div className="col">
             <div className="profile-completion m-b-20">
diff --git a/app/styles/app.css b/app/styles/app.css
index 44c3c25ec..4b4e4b85a 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -438,17 +438,19 @@ button{outline:none!important;background-color:transparent;font-size:11px;cursor
 
 .btn-outline-dark:hover, .btn-outline-dark:focus, .btn-outline-dark:active {
   color: #fff;
-  background-color: #2C96FF;
-  border: 1px solid #2C96FF;
+  background-color: #2e2e2e;
+  border: 1px solid #2e2e2e;
   font-weight: 700;
+  -webkit-box-shadow: none;
+  box-shadow: none;
 }
 
 .btn-outline-alpha-light{color:#fff;background-color:transparent;border:1px solid rgba(255,255,255,0.25);}
 .btn-outline-alpha-light:hover,.btn-outline-alpha-light:focus,.btn-outline-alpha-light:active{color:#212529;background-color:#fff;border:1px solid #fff;font-weight:700;}
 .btn-tertiary{color:#fff;border:1px solid #AEAEAE;font-weight:700;background-color:#AEAEAE;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;}
 .btn-tertiary:hover,.btn-tertiary:focus,.btn-tertiary:active{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:#7B7B7B;border: 1px solid #7B7B7B;}
-.btn-dark,.btn-verify{color:#fff;background-color:#222222;}
-.btn-link{color:#222222;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn-dark,.btn-verify{color:#fff;background-color:#2e2e2e;}
+.btn-link{color:#2e2e2e;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn-link:focus,.btn-link:hover{color:#2C96FF;text-decoration:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn-link.active{color:#2C96FF;text-decoration:none;}
 .btn-link-secondary{color:#222222;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
@@ -664,7 +666,7 @@ a.modal-body{color:#949494;font-size:0.8125rem;text-decoration:underline;line-he
 	div.home-profiles a .btn-home-button{position:absolute;top:75px;left:0px;right:auto;}
 	.item-sidebar-wallet.active,.list-group-item.item-sidebar-wallet{padding-left:6.25rem;padding-right:6.25rem;}
   .qrcode-wallet{max-width:225px;}
-  .container-fluid{max-width: 960px;}
+  .container-fluid{max-width: 720px;}
 }
 
 /* Medium devices (desktops, 975px and up) */

From 8eefc730803c383a459f70dd4399a3fc417b81d1 Mon Sep 17 00:00:00 2001
From: Guy Lepage <guylepage3@gmail.com>
Date: Thu, 2 Nov 2017 17:20:37 -0400
Subject: [PATCH 05/24] update to navbar & items #1025

---
 app/js/components/Navbar.js | 2 +-
 app/styles/app.css          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/js/components/Navbar.js b/app/js/components/Navbar.js
index 9f5494455..8d339e31b 100644
--- a/app/js/components/Navbar.js
+++ b/app/js/components/Navbar.js
@@ -114,7 +114,7 @@ class Navbar extends Component {
     return (
       <header
         className="container-fluid no-padding bg-white fixed-top"
-        style={{ maxWidth: 'unset', zIndex: 9 }} 
+        style={{ maxWidth: 'unset', zIndex: 9 }}
       >
         <nav className="navbar navbar-expand container-lg mx-auto" >
           <ul className="navbar-nav container-fluid">
diff --git a/app/styles/app.css b/app/styles/app.css
index 4b4e4b85a..31d26e5d4 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -486,10 +486,10 @@ input.form-control-secondary{background-color:#fafafa;border:1px solid #F4F2F4;}
 
 
 /* 16. Navbar */
-header{padding-bottom:10px;border-bottom:1px solid #F0F0F0;}
+header{padding-bottom:13px;border-bottom:1px solid #F0F0F0;}
 .navbar{padding:0!important;height:70px;text-align:center;}
 .navbar-expand{width:85%;}
-.nav-item{width:88px;text-align:center;text-transform: uppercase;font-family:'Lato',sans-serif;font-size:11px;font-weight:700}
+.nav-item{width:88px;text-align:center;text-transform: uppercase;font-family:'Lato',sans-serif;font-size:12px;font-weight:700}
 .nav-link{width:100%;}
 .nav-link img{margin:auto;}
 .nav-item span {color:#949494;}

From 9330e5a2604f3a268245e07cff9e8f40b1715a52 Mon Sep 17 00:00:00 2001
From: Guy Lepage <guylepage3@gmail.com>
Date: Thu, 2 Nov 2017 17:25:44 -0400
Subject: [PATCH 06/24] update to username button #1024

---
 app/js/profiles/DefaultProfilePage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/js/profiles/DefaultProfilePage.js b/app/js/profiles/DefaultProfilePage.js
index 27a8204d5..fee97394b 100644
--- a/app/js/profiles/DefaultProfilePage.js
+++ b/app/js/profiles/DefaultProfilePage.js
@@ -667,7 +667,7 @@ class DefaultProfilePage extends Component {
                       {identity.canAddUsername ?
                         <Link
                           to={`/profiles/i/add-username/${identityIndex}/search`}
-                          className="btn btn-link btn-link-mute btn-xs"
+                          className="btn btn-outline-dark btn-pill btn-xs m-t-15 m-b-15"
                         >
                          Add a username
                         </Link>

From e6bf574dc41da10d98b69784966cdf6f33eeab5d Mon Sep 17 00:00:00 2001
From: Ken <yukanliao@gmail.com>
Date: Thu, 2 Nov 2017 17:43:20 -0400
Subject: [PATCH 07/24] Open edit when clicking social account.

---
 app/js/profiles/components/SocialAccountItem.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/js/profiles/components/SocialAccountItem.js b/app/js/profiles/components/SocialAccountItem.js
index 7196d8a80..7a221c7bc 100644
--- a/app/js/profiles/components/SocialAccountItem.js
+++ b/app/js/profiles/components/SocialAccountItem.js
@@ -91,11 +91,7 @@ class SocialAccountItem extends Component {
   }
 
   onClick = (e) => {
-    if (!this.props.placeholder && !this.props.editing) {
-      openInNewTab(this.getAccountUrl())
-    } else {
-      this.props.onClick(this.props.service)
-    }
+    this.props.onClick(this.props.service)
   }
 
   onVerifiedCheckmarkClick = (e) => {

From ccdeff77527dde1b6dc5c73b04fd06dc697a23df Mon Sep 17 00:00:00 2001
From: Ken <yukanliao@gmail.com>
Date: Thu, 2 Nov 2017 17:47:40 -0400
Subject: [PATCH 08/24] Remove facebook, linkedin, instagram from available
 social proofs.

---
 app/js/profiles/DefaultProfilePage.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/js/profiles/DefaultProfilePage.js b/app/js/profiles/DefaultProfilePage.js
index fee97394b..215016a67 100644
--- a/app/js/profiles/DefaultProfilePage.js
+++ b/app/js/profiles/DefaultProfilePage.js
@@ -25,10 +25,7 @@ const logger = log4js.getLogger('profiles/DefaultProfilePage.js')
 
 const accountTypes = [
   'twitter',
-  'facebook',
-  'linkedIn',
   'github',
-  'instagram',
   'hackerNews',
   'bitcoin',
   'ethereum',

From 1531e978c12f24a1110942ed35ee835144075be7 Mon Sep 17 00:00:00 2001
From: Ken <yukanliao@gmail.com>
Date: Thu, 2 Nov 2017 17:49:56 -0400
Subject: [PATCH 09/24] Update support button to go to forum.

---
 app/js/App.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/js/App.js b/app/js/App.js
index 29da66838..9b875ff23 100644
--- a/app/js/App.js
+++ b/app/js/App.js
@@ -146,7 +146,7 @@ class App extends Component {
   }
 
   onSupportClick = () => {
-    openInNewTab('https://blockstack.zendesk.com/hc/en-us')
+    openInNewTab('https://forum.blockstack.org/t/frequently-ask-questions/2123')
   }
 
   closeModal() {

From 6aea1177b85d67766551d1d59f8305028f16f89a Mon Sep 17 00:00:00 2001
From: Ken <yukanliao@gmail.com>
Date: Thu, 2 Nov 2017 20:00:28 -0400
Subject: [PATCH 10/24] Revert removing facebook, instagram.

---
 app/js/profiles/DefaultProfilePage.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/js/profiles/DefaultProfilePage.js b/app/js/profiles/DefaultProfilePage.js
index 215016a67..fee97394b 100644
--- a/app/js/profiles/DefaultProfilePage.js
+++ b/app/js/profiles/DefaultProfilePage.js
@@ -25,7 +25,10 @@ const logger = log4js.getLogger('profiles/DefaultProfilePage.js')
 
 const accountTypes = [
   'twitter',
+  'facebook',
+  'linkedIn',
   'github',
+  'instagram',
   'hackerNews',
   'bitcoin',
   'ethereum',

From d5ac44082f191d00dc16b40825db84ab1410daf5 Mon Sep 17 00:00:00 2001
From: Larry Salibra <larry@appartisan.com>
Date: Fri, 3 Nov 2017 09:40:10 +0900
Subject: [PATCH 11/24] try to load profile from default storage location if
 identity address has no name #917

---
 app/js/profiles/store/identity/actions.js     | 51 +++++++++++++++++--
 .../store/identity/actions/async.test.js      |  2 +-
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/app/js/profiles/store/identity/actions.js b/app/js/profiles/store/identity/actions.js
index f767ed0fe..26ab9bdfe 100644
--- a/app/js/profiles/store/identity/actions.js
+++ b/app/js/profiles/store/identity/actions.js
@@ -11,10 +11,12 @@ import {
   getIdentityOwnerAddressNode,
   authorizationHeaderValue
 } from '../../../utils/index'
-import { DEFAULT_PROFILE } from '../../../utils/profile-utils'
+import { DEFAULT_PROFILE,
+  getProfileFromTokens } from '../../../utils/profile-utils'
 import { calculateTrustLevel } from '../../../utils/account-utils'
 import { AccountActions } from '../../../account/store/account'
 
+
 import type { Dispatch } from 'redux'
 
 import log4js from 'log4js'
@@ -192,6 +194,9 @@ function createNewProfile(encryptedBackupPhrase: string,
  * Checks each owner address to see if it owns a name, if it owns a name,
  * it resolves the profile and updates the state with the owner address's
  * current name.
+ *
+ * If it doesn't have a name, check default gaia storage for a profile
+ *
  */
 function refreshIdentities(api: {bitcoinAddressLookupUrl: string,
   nameLookupUrl: string}, ownerAddresses: Array<string>) {
@@ -202,14 +207,52 @@ function refreshIdentities(api: {bitcoinAddressLookupUrl: string,
       const promise: Promise<*> = new Promise((resolve) => {
         const url = api.bitcoinAddressLookupUrl.replace('{address}', address)
         logger.debug(`refreshIdentities: fetching ${url}`)
-        fetch(url)
+        return fetch(url)
         .then((response) => response.text())
         .then((responseText) => JSON.parse(responseText))
         .then((responseJson) => {
           if (responseJson.names.length === 0) {
             logger.debug(`refreshIdentities: ${address} owns no names`)
-            resolve()
-            return Promise.resolve()
+            const gaiaBucketAddress = ownerAddresses[0]
+            const profileUrlBase = `https://gaia.blockstack.org/hub/${gaiaBucketAddress}`
+            const profileUrl = `${profileUrlBase}/${index}/profile.json`
+            logger.debug(`refreshIdentities: check default storage for profile: ${profileUrl}`)
+            return fetch(profileUrl)
+            .then(response => {
+              if (response.ok) {
+                response.text()
+                .then(responseText => JSON.parse(responseText))
+                .then((responseJsonProfile) => {
+                  const tokenRecords = responseJsonProfile
+                  const profile = getProfileFromTokens(tokenRecords, address)
+                  if (profile) {
+                    logger.debug(`refreshIdentities: found profile at ${profileUrl}`)
+                    const zoneFile = ''
+                    dispatch(updateProfile(index, profile, zoneFile))
+                    let verifications = []
+                    let trustLevel = 0
+                    logger.debug(`refreshIdentities: validating address proofs for ${address}`)
+                    return validateProofs(profile, address).then((proofs) => {
+                      verifications = proofs
+                      trustLevel = calculateTrustLevel(verifications)
+                      dispatch(updateSocialProofVerifications(index, verifications, trustLevel))
+                    })
+                    .catch((error) => {
+                      logger.error(`refreshIdentities: ${address} validateProofs: error`, error)
+                      return Promise.resolve()
+                    })
+                  } else {
+                    resolve()
+                    return Promise.resolve()
+                  }
+                })
+                return Promise.resolve()
+              } else {
+                logger.debug(`refreshIdentities: nothing found in default storage at ${profileUrl}`)
+                resolve()
+                return Promise.resolve()
+              }
+            })
           } else {
             if (responseJson.names.length === 1) {
               logger.debug(`refreshIdentities: ${address} has 1 name}`)
diff --git a/tests/profiles/store/identity/actions/async.test.js b/tests/profiles/store/identity/actions/async.test.js
index f42150378..cd75b63a7 100644
--- a/tests/profiles/store/identity/actions/async.test.js
+++ b/tests/profiles/store/identity/actions/async.test.js
@@ -110,7 +110,7 @@ describe('Identity Store: Async Actions', () => {
       })
     })
 
-    it('emits no actions if addresss owns no names', () => {
+    it('checks default storage for profile if address owns no names', () => {
       // mock core
       nock('http://localhost:6270')
       .get('/v1/addresses/bitcoin/18AJ31xprVk8u2KqT18NvbmUgkYo9MPYD6')

From f11453148d83b06673fee376c5ee7a14646ea97b Mon Sep 17 00:00:00 2001
From: Ken <yukanliao@gmail.com>
Date: Thu, 2 Nov 2017 23:19:18 -0400
Subject: [PATCH 12/24] Hide instagram and linkedin account types by default.

---
 app/js/profiles/DefaultProfilePage.js | 50 +++++++++++++++++++++++----
 app/styles/app.css                    |  1 +
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/app/js/profiles/DefaultProfilePage.js b/app/js/profiles/DefaultProfilePage.js
index fee97394b..886287210 100644
--- a/app/js/profiles/DefaultProfilePage.js
+++ b/app/js/profiles/DefaultProfilePage.js
@@ -26,14 +26,19 @@ const logger = log4js.getLogger('profiles/DefaultProfilePage.js')
 const accountTypes = [
   'twitter',
   'facebook',
-  'linkedIn',
   'github',
-  'instagram',
   'hackerNews',
   'bitcoin',
   'ethereum',
   'pgp',
-  'ssh'
+  'ssh',
+  'linkedIn',
+  'instagram'
+]
+
+const hiddenAccountTypes = [
+  'linkedIn',
+  'instagram'
 ]
 
 function mapStateToProps(state) {
@@ -86,7 +91,8 @@ class DefaultProfilePage extends Component {
       socialAccountModalIsOpen: false,
       accountModalIsOpen: false,
       editingSocialAccount: {},
-      editingAccount: {}
+      editingAccount: {},
+      showHiddenPlaceholders: false
     }
 
     this.onValueChange = this.onValueChange.bind(this)
@@ -329,6 +335,12 @@ class DefaultProfilePage extends Component {
     this.closeAccountModal()
   }
 
+  onMoreAccountsClick = () => {
+    this.setState({
+      showHiddenPlaceholders: true
+    })
+  }
+
   componentHasNewLocalIdentities(props) {
     logger.trace('componentHasNewLocalIdentities')
     const identityIndex = this.props.defaultIdentity
@@ -516,6 +528,7 @@ class DefaultProfilePage extends Component {
 
     const filledAccounts = []
     const placeholders = []
+    let hiddenAccounts = hiddenAccountTypes
 
     if (this.state.profile.hasOwnProperty('account')) {
       accountTypes.forEach((accountType) => {
@@ -528,18 +541,38 @@ class DefaultProfilePage extends Component {
           }
         })
 
+        const hiddenAccount = (hiddenAccounts.indexOf(accountType) >= 0)
+
+        if (hasAccount && hiddenAccount) {
+          hiddenAccounts = hiddenAccounts.filter(hiddenAccount => hiddenAccount !== accountType)
+        }
+
         if (!hasAccount) {
-          placeholders.push(this.createPlaceholderAccount(accountType))
+          if (hiddenAccount) { 
+            if (this.state.showHiddenPlaceholders) {
+              placeholders.push(this.createPlaceholderAccount(accountType))
+            }
+          } else {
+            placeholders.push(this.createPlaceholderAccount(accountType))
+          }
         }
       })
     } else {
       accountTypes.forEach((accountType) => {
-        placeholders.push(this.createPlaceholderAccount(accountType))
+        const hiddenAccount = (hiddenAccounts.indexOf(accountType) >= 0)
+        if (hiddenAccount) { 
+          if (this.state.showHiddenPlaceholders) {
+            placeholders.push(this.createPlaceholderAccount(accountType))
+          }
+        } else {
+          placeholders.push(this.createPlaceholderAccount(accountType))
+        }
       })
     }
 
     // const accounts = person.profile().account || []
     const accounts = filledAccounts.concat(placeholders)
+    const showMoreAccountsButton = hiddenAccounts.length > 0
     // const connections = person.connections() || []
 
     return (
@@ -811,6 +844,11 @@ class DefaultProfilePage extends Component {
                       }
                     })}
                   </ul>
+                  {(!this.state.showHiddenPlaceholders && showMoreAccountsButton) &&
+                    <button className="btn btn-link btn-link-mute btn-link-small pl-5" 
+                      onClick={this.onMoreAccountsClick}>More accounts
+                    </button>
+                  }
                 </div>
               </div>
             </div>
diff --git a/app/styles/app.css b/app/styles/app.css
index 31d26e5d4..77b87f592 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -460,6 +460,7 @@ button{outline:none!important;background-color:transparent;font-size:11px;cursor
 .btn.disabled.btn-storage,.btn:disabled.btn-storage{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:#AEAEAE;border:1px solid #AEAEAE;}
 .btn-thin{line-height:1.0rem;padding:0px;}
 .btn-clipboard{width:40px;height:40px;color:#494F56;padding:0;border:0;}
+.btn-link-small{font-size:12px;padding:0;}
 .storage-page button:disabled{cursor:default;}
 
 

From a9b08f2daefe96a5ba036fe80427c1854638deeb Mon Sep 17 00:00:00 2001
From: Ken <yukanliao@gmail.com>
Date: Thu, 2 Nov 2017 23:21:21 -0400
Subject: [PATCH 13/24] Center more accounts button.

---
 app/js/profiles/DefaultProfilePage.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/js/profiles/DefaultProfilePage.js b/app/js/profiles/DefaultProfilePage.js
index 886287210..4517ff9a8 100644
--- a/app/js/profiles/DefaultProfilePage.js
+++ b/app/js/profiles/DefaultProfilePage.js
@@ -844,11 +844,13 @@ class DefaultProfilePage extends Component {
                       }
                     })}
                   </ul>
-                  {(!this.state.showHiddenPlaceholders && showMoreAccountsButton) &&
-                    <button className="btn btn-link btn-link-mute btn-link-small pl-5" 
-                      onClick={this.onMoreAccountsClick}>More accounts
-                    </button>
-                  }
+                  <div className="text-center">
+                    {(!this.state.showHiddenPlaceholders && showMoreAccountsButton) &&
+                      <button className="btn btn-link btn-link-mute btn-link-small" 
+                        onClick={this.onMoreAccountsClick}>More accounts
+                      </button>
+                    }
+                  </div>
                 </div>
               </div>
             </div>

From 435d46f98a3ce8bda6781a34cc927ae9f7ae587c Mon Sep 17 00:00:00 2001
From: Ken <yukanliao@gmail.com>
Date: Thu, 2 Nov 2017 23:29:34 -0400
Subject: [PATCH 14/24] Improve Facebook verification instructions.

---
 app/js/profiles/components/VerificationInfo.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/js/profiles/components/VerificationInfo.js b/app/js/profiles/components/VerificationInfo.js
index 51fa0a390..774d399a5 100644
--- a/app/js/profiles/components/VerificationInfo.js
+++ b/app/js/profiles/components/VerificationInfo.js
@@ -76,7 +76,8 @@ class FacebookVerificationInfo extends Component {
       <div>
         <p>
           <span className="font-weight-bold">Step 2: </span>
-          Post the following text to your Facebook timeline. Make sure your post is public!
+          Copy and post the following text to your Facebook timeline.
+          &nbsp;<strong>Make sure your post is public!</strong>
         </p>
         <div className="verification-quote">
           {this.props.verificationMessage}

From aca90841aba9085aa8b134114d292bd072832c6a Mon Sep 17 00:00:00 2001
From: Ken <yukanliao@gmail.com>
Date: Thu, 2 Nov 2017 23:49:46 -0400
Subject: [PATCH 15/24] Add help links to verification modals.

---
 .../components/EditSocialAccountModal.js      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/js/profiles/components/EditSocialAccountModal.js b/app/js/profiles/components/EditSocialAccountModal.js
index b75112c68..4d6e2762b 100644
--- a/app/js/profiles/components/EditSocialAccountModal.js
+++ b/app/js/profiles/components/EditSocialAccountModal.js
@@ -4,9 +4,17 @@ import { connect } from 'react-redux'
 import Modal from 'react-modal'
 import InputGroup from '../../components/InputGroup'
 import VerificationInfo from '../components/VerificationInfo'
+import { openInNewTab } from '../../utils'
 
 import { getWebAccountTypes } from '../../utils'
 
+const helpPages = {
+  twitter: 'https://forum.blockstack.org/t/twitter-verification-process/2143',
+  facebook: 'https://forum.blockstack.org/t/facebook-verification-process/2142/3',
+  github: 'https://forum.blockstack.org/t/github-verification-process/2145',
+  instagram: 'https://forum.blockstack.org/t/instagram-verification-process/2144',
+}
+
 function mapStateToProps(state) {
   return {
     api: state.settings.api
@@ -127,6 +135,12 @@ class EditSocialAccountModal extends Component {
     return !this.props.verified && (this.props.identifier.length > 0)
   }
 
+  showHelp = () => {
+    if (helpPages.hasOwnProperty(this.props.service)) {
+      openInNewTab(helpPages[this.props.service])
+    }
+  }
+
   render() {
     const webAccountTypes = getWebAccountTypes(this.props.api)
     const verifiedClass = this.props.verified ? "verified" : (this.state.collapsed ? "pending" : "")
@@ -205,6 +219,11 @@ class EditSocialAccountModal extends Component {
                 this.state.identifier, this.state.proofUrl)}>
               Verify
             </button>
+            <div className="text-center">
+              {helpPages.hasOwnProperty(this.props.service) && 
+                <button className="btn btn-link btn-link-small p-t-10" onClick={this.showHelp}>Need help?</button>
+              }
+            </div>
           </Modal>
         )
     } else {

From d5c4ad450060c25fd0c020bfd66861c944a187ae Mon Sep 17 00:00:00 2001
From: Ken <yukanliao@gmail.com>
Date: Thu, 2 Nov 2017 23:54:21 -0400
Subject: [PATCH 16/24] Improve GitHub verification instructions.

---
 app/js/profiles/components/VerificationInfo.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/js/profiles/components/VerificationInfo.js b/app/js/profiles/components/VerificationInfo.js
index 774d399a5..74387de8c 100644
--- a/app/js/profiles/components/VerificationInfo.js
+++ b/app/js/profiles/components/VerificationInfo.js
@@ -121,7 +121,8 @@ class GithubVerificationInfo extends Component {
         <p>
           <span className="font-weight-bold">Step 2: </span>
           Copy the text below and click on the create gist button.
-          Then paste the text into the body of the gist and click Create Public Gist.
+          Then paste the text into the body of your new gist and click
+          &nbsp;<strong>Create Public Gist.</strong>
         </p>
         <div className="verification-quote">
           {this.props.verificationMessage}

From af4e67d017507fadc81b71dc7c91a728e26db6a1 Mon Sep 17 00:00:00 2001
From: Ken <yukanliao@gmail.com>
Date: Fri, 3 Nov 2017 00:15:57 -0400
Subject: [PATCH 17/24] Pull edit profile buttons out of secondary nav.

---
 app/js/profiles/DefaultProfilePage.js | 37 ++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/app/js/profiles/DefaultProfilePage.js b/app/js/profiles/DefaultProfilePage.js
index 4517ff9a8..78bf565d8 100644
--- a/app/js/profiles/DefaultProfilePage.js
+++ b/app/js/profiles/DefaultProfilePage.js
@@ -780,15 +780,34 @@ class DefaultProfilePage extends Component {
             </div>
           </div>
 
-          <SecondaryNavBar
-            leftButtonTitle={this.state.editMode ? 'Save' : 'Edit'}
-            leftIsButton
-            onLeftButtonClick={this.state.editMode ? this.onSaveClick : this.onEditClick}
-            rightButtonTitle={this.state.editMode ? 'Cancel' : 'More'}
-            rightIsButton={this.state.editMode}
-            onRightButtonClick={this.state.editMode ? this.onCancelClick : null}
-            rightButtonLink={this.state.editMode ? '' : '/profiles/i/all'}
-          />
+          <div className="container-fluid p-0">
+            <div className="row m-t-10 text-center">
+              <div className="col">
+                <button
+                  className='btn btn-outline-dark btn-pill btn-sm ml-5'
+                  title={this.state.editMode ? 'Save' : 'Edit'}
+                  onClick={this.state.editMode ? this.onSaveClick : this.onEditClick}>
+                  {this.state.editMode ? 'Save' : 'Edit'}
+                </button>
+              </div>
+              <div className="col">
+                {this.state.editMode ?
+                  <button
+                    className='btn btn-outline-dark btn-pill btn-sm mr-5'
+                    title='Cancel'
+                    onClick={this.onCancelClick}>
+                    Cancel
+                  </button> 
+                  :
+                  <Link
+                    className='btn btn-outline-dark btn-pill btn-sm mr-5'
+                    to='/profiles/i/all'>
+                    More
+                  </Link>
+                }
+              </div>
+            </div>
+          </div>
 
           <div className="container-fluid p-0">
             <div className="row m-t-50 no-gutters">

From 319843d9aeba07bdef9579e8281fbaa227bf011c Mon Sep 17 00:00:00 2001
From: Ken <yukanliao@gmail.com>
Date: Fri, 3 Nov 2017 00:27:02 -0400
Subject: [PATCH 18/24] Fix secondary nav alignment.

---
 app/js/components/SecondaryNavBar.js | 19 +++++++++++++------
 app/js/wallet/WalletApp.js           |  1 +
 app/styles/app.css                   |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/js/components/SecondaryNavBar.js b/app/js/components/SecondaryNavBar.js
index 92ae395d2..26da16b20 100644
--- a/app/js/components/SecondaryNavBar.js
+++ b/app/js/components/SecondaryNavBar.js
@@ -8,7 +8,7 @@ const SecondaryNavLink = props => {
 
   return (
     <Link
-      className={`btn btn-outline-dark btn-pill btn-sm ${active}`}
+      className={`btn btn-outline-dark btn-pill btn-sm ${active} ${props.customButtonClass}`}
       to={props.link}>
       {props.title}
     </Link>
@@ -21,7 +21,7 @@ const SecondaryNavButton = props => {
 
   return (
     <button
-      className={`btn btn-outline-dark btn-pill btn-sm ${active}`}
+      className={`btn btn-outline-dark btn-pill btn-sm ${active} ${props.customButtonClass}`}
       title={props.title}
       onClick={props.onClick}>
       {props.title}
@@ -47,15 +47,16 @@ class SecondaryNavBar extends Component {
     isLeftActive: PropTypes.bool,
     isCenterActive: PropTypes.bool,
     isRightActive: PropTypes.bool,
-    activeClass: PropTypes.string
+    activeClass: PropTypes.string,
+    customButtonClass: PropTypes.string
   }
 
   render() {
     const activeClass = this.props.activeClass ? this.props.activeClass : ""
     return (
-      <div className="container-xs secondary-nav mx-auto">
+      <div className="container-fluid secondary-nav mx-auto">
         <div className="row">
-          <div className="col text-center">
+          <div className="col text-left">
             {this.props.leftButtonTitle !== undefined && (
               this.props.leftIsButton ?
               <SecondaryNavButton
@@ -64,6 +65,7 @@ class SecondaryNavBar extends Component {
                 align="left"
                 isActive={this.props.isLeftActive}
                 activeClass={activeClass}
+                customButtonClass={this.props.customButtonClass}
                />
               :
               <SecondaryNavLink
@@ -72,6 +74,7 @@ class SecondaryNavBar extends Component {
                 align="left"
                 isActive={this.props.isLeftActive}
                 activeClass={activeClass}
+                customButtonClass={this.props.customButtonClass}
                />
               ) }
           </div>
@@ -84,6 +87,7 @@ class SecondaryNavBar extends Component {
                 align="right"
                 isActive={this.props.isCenterActive}
                 activeClass={activeClass}
+                customButtonClass={this.props.customButtonClass}
               />
             :
               <SecondaryNavLink
@@ -92,10 +96,11 @@ class SecondaryNavBar extends Component {
                 align="right"
                 isActive={this.props.isCenterActive}
                 activeClass={activeClass}
+                customButtonClass={this.props.customButtonClass}
               />
           )}
           </div>
-          <div className="col text-center">
+          <div className="col text-right">
           {this.props.rightButtonTitle !== undefined && (
             this.props.rightIsButton ?
             <SecondaryNavButton
@@ -104,6 +109,7 @@ class SecondaryNavBar extends Component {
               align="right"
               isActive={this.props.isRightActive}
               activeClass={activeClass}
+              customButtonClass={this.props.customButtonClass}
             />
             :
             <SecondaryNavLink
@@ -112,6 +118,7 @@ class SecondaryNavBar extends Component {
               align="right"
               isActive={this.props.isRightActive}
               activeClass={activeClass}
+              customButtonClass={this.props.customButtonClass}
             />
             ) }
           </div>
diff --git a/app/js/wallet/WalletApp.js b/app/js/wallet/WalletApp.js
index 801bd0105..56981a8a7 100644
--- a/app/js/wallet/WalletApp.js
+++ b/app/js/wallet/WalletApp.js
@@ -41,6 +41,7 @@ class WalletApp extends Component {
           rightButtonLink="/wallet/send"
           isRightActive={(activeTabUrl === '/wallet/send')}
           activeClass="active-wallet"
+          customButtonClass="btn-wallet"
         />
         <div className="container-fluid col-centered form-container-secondary">
           <div>
diff --git a/app/styles/app.css b/app/styles/app.css
index 77b87f592..8d56b4100 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -618,7 +618,7 @@ a.modal-body{color:#949494;font-size:0.8125rem;text-decoration:underline;line-he
 .clickable{cursor:pointer;}
 /* Support button */
 .support-floater{position:fixed;bottom:30px;right:30px;color:#fff;background-color:#18091F;height:50px;width:50px;text-align:center;padding-top:5px;border-radius:25px;font-size:25px;font-weight:700;box-shadow: 4px 4px 35px 0px rgba(0, 0, 0, 0.5)}
-
+.btn-wallet{width:200px;}
 
 .react-contextmenu{min-width:160px;padding:5px 5px;margin:2px 0 0;text-align:left;background-color:#fff;background-clip:padding-box;border-radius:0;outline:none;opacity:0;pointer-events:none;transition:opacity 250ms ease!important;box-shadow:0px 0px 25px 0px rgba(0,0,0,0.08);}
 .react-contextmenu-item.react-contextmenu-item--active,.react-contextmenu-item.react-contextmenu-item--selected{color:#fff;background-color:#2C96FF;border-color:#2C96FF;text-decoration:none;}

From fe5fd716b7926b27c1f3bb6b0ab5ca941fd21dcc Mon Sep 17 00:00:00 2001
From: Ken <yukanliao@gmail.com>
Date: Fri, 3 Nov 2017 00:30:58 -0400
Subject: [PATCH 19/24] Clean up wallet secondary nav buttons.

---
 app/styles/app.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/app.css b/app/styles/app.css
index 8d56b4100..ee5d89ee1 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -618,7 +618,7 @@ a.modal-body{color:#949494;font-size:0.8125rem;text-decoration:underline;line-he
 .clickable{cursor:pointer;}
 /* Support button */
 .support-floater{position:fixed;bottom:30px;right:30px;color:#fff;background-color:#18091F;height:50px;width:50px;text-align:center;padding-top:5px;border-radius:25px;font-size:25px;font-weight:700;box-shadow: 4px 4px 35px 0px rgba(0, 0, 0, 0.5)}
-.btn-wallet{width:200px;}
+.btn-wallet{width:160px;}
 
 .react-contextmenu{min-width:160px;padding:5px 5px;margin:2px 0 0;text-align:left;background-color:#fff;background-clip:padding-box;border-radius:0;outline:none;opacity:0;pointer-events:none;transition:opacity 250ms ease!important;box-shadow:0px 0px 25px 0px rgba(0,0,0,0.08);}
 .react-contextmenu-item.react-contextmenu-item--active,.react-contextmenu-item.react-contextmenu-item--selected{color:#fff;background-color:#2C96FF;border-color:#2C96FF;text-decoration:none;}

From b5c6fa004d2e246178719e835c10540b7931671e Mon Sep 17 00:00:00 2001
From: Ken <yukanliao@gmail.com>
Date: Fri, 3 Nov 2017 00:39:11 -0400
Subject: [PATCH 20/24] Fix lint.

---
 app/js/profiles/DefaultProfilePage.js | 35 +++++++++++++++------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/js/profiles/DefaultProfilePage.js b/app/js/profiles/DefaultProfilePage.js
index 78bf565d8..7a97844d0 100644
--- a/app/js/profiles/DefaultProfilePage.js
+++ b/app/js/profiles/DefaultProfilePage.js
@@ -4,7 +4,6 @@ import { connect } from 'react-redux'
 import { Link } from 'react-router'
 import { Person } from 'blockstack'
 import Modal from 'react-modal'
-import SecondaryNavBar from '../components/SecondaryNavBar'
 import Image from '../components/Image'
 import { IdentityActions } from './store/identity'
 import { AccountActions }  from '../account/store/account'
@@ -541,14 +540,14 @@ class DefaultProfilePage extends Component {
           }
         })
 
-        const hiddenAccount = (hiddenAccounts.indexOf(accountType) >= 0)
+        const hideAccount = (hiddenAccounts.indexOf(accountType) >= 0)
 
-        if (hasAccount && hiddenAccount) {
+        if (hasAccount && hideAccount) {
           hiddenAccounts = hiddenAccounts.filter(hiddenAccount => hiddenAccount !== accountType)
         }
 
         if (!hasAccount) {
-          if (hiddenAccount) { 
+          if (hideAccount) { 
             if (this.state.showHiddenPlaceholders) {
               placeholders.push(this.createPlaceholderAccount(accountType))
             }
@@ -559,8 +558,8 @@ class DefaultProfilePage extends Component {
       })
     } else {
       accountTypes.forEach((accountType) => {
-        const hiddenAccount = (hiddenAccounts.indexOf(accountType) >= 0)
-        if (hiddenAccount) { 
+        const hideAccount = (hiddenAccounts.indexOf(accountType) >= 0)
+        if (hideAccount) { 
           if (this.state.showHiddenPlaceholders) {
             placeholders.push(this.createPlaceholderAccount(accountType))
           }
@@ -784,24 +783,27 @@ class DefaultProfilePage extends Component {
             <div className="row m-t-10 text-center">
               <div className="col">
                 <button
-                  className='btn btn-outline-dark btn-pill btn-sm ml-5'
+                  className="btn btn-outline-dark btn-pill btn-sm ml-5"
                   title={this.state.editMode ? 'Save' : 'Edit'}
-                  onClick={this.state.editMode ? this.onSaveClick : this.onEditClick}>
+                  onClick={this.state.editMode ? this.onSaveClick : this.onEditClick}
+                >
                   {this.state.editMode ? 'Save' : 'Edit'}
                 </button>
               </div>
               <div className="col">
                 {this.state.editMode ?
                   <button
-                    className='btn btn-outline-dark btn-pill btn-sm mr-5'
-                    title='Cancel'
-                    onClick={this.onCancelClick}>
+                    className="btn btn-outline-dark btn-pill btn-sm mr-5"
+                    title="Cancel"
+                    onClick={this.onCancelClick}
+                  >
                     Cancel
                   </button> 
                   :
                   <Link
-                    className='btn btn-outline-dark btn-pill btn-sm mr-5'
-                    to='/profiles/i/all'>
+                    className="btn btn-outline-dark btn-pill btn-sm mr-5"
+                    to="/profiles/i/all"
+                  >
                     More
                   </Link>
                 }
@@ -865,8 +867,11 @@ class DefaultProfilePage extends Component {
                   </ul>
                   <div className="text-center">
                     {(!this.state.showHiddenPlaceholders && showMoreAccountsButton) &&
-                      <button className="btn btn-link btn-link-mute btn-link-small" 
-                        onClick={this.onMoreAccountsClick}>More accounts
+                      <button 
+                        className="btn btn-link btn-link-mute btn-link-small" 
+                        onClick={this.onMoreAccountsClick}
+                      >
+                        More accounts
                       </button>
                     }
                   </div>

From fe87360898aa52eb569bb7f57cc90924d17831b1 Mon Sep 17 00:00:00 2001
From: Larry Salibra <larry@appartisan.com>
Date: Fri, 3 Nov 2017 13:58:45 +0900
Subject: [PATCH 21/24] bump version

---
 native/macos/Blockstack/Blockstack/Info.plist | 4 ++--
 package.json                                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/native/macos/Blockstack/Blockstack/Info.plist b/native/macos/Blockstack/Blockstack/Info.plist
index fcdcedf27..09c76d6fd 100644
--- a/native/macos/Blockstack/Blockstack/Info.plist
+++ b/native/macos/Blockstack/Blockstack/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.20.0</string>
+	<string>0.20.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>70</string>
+	<string>71</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/package.json b/package.json
index 3d0a3b3c5..1d2381ef4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blockstack-browser",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "author": "Blockstack PBC <admin@blockstack.com>",
   "description": "The Blockstack browser",
   "license": "MPL-2.0",

From ef637b3e6e19a65f78cc1720c7c66066163cdc2d Mon Sep 17 00:00:00 2001
From: Larry Salibra <larry@appartisan.com>
Date: Fri, 3 Nov 2017 13:59:24 +0900
Subject: [PATCH 22/24] update blockstack.js to v0.13.3 for proofs improvements

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1d2381ef4..37016ac3c 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "bigi": "^1.4.2",
     "bip39": "^2.2.0",
     "bitcoinjs-lib": "^3.2.0",
-    "blockstack": "0.13.2",
+    "blockstack": "0.13.3",
     "body-parser": "^1.16.1",
     "bootstrap": "^4.0.0-beta",
     "browser-stdout": "^1.3.0",

From 5f7926c57f36c84c9c9bf79436f5858a6efcd308 Mon Sep 17 00:00:00 2001
From: Larry Salibra <larry@appartisan.com>
Date: Fri, 3 Nov 2017 14:04:16 +0900
Subject: [PATCH 23/24] update lock file

---
 package-lock.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fa385d045..4bc2eaa21 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "blockstack-browser",
-  "version": "0.19.2",
+  "version": "0.20.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3004,9 +3004,9 @@
       }
     },
     "blockstack": {
-      "version": "0.13.2",
-      "resolved": "https://registry.npmjs.org/blockstack/-/blockstack-0.13.2.tgz",
-      "integrity": "sha512-3GkgzcdfQXYbqV+1Dz+k+uXTLYm5Y5Y7DJ7wjPVhhS8SG7vrSX/8E9gHBjJBkRX5lNMQ7pzM6Dce3jpXwmZ9tw==",
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/blockstack/-/blockstack-0.13.3.tgz",
+      "integrity": "sha512-HvQEubCKW+qbJTK0ki/J7wgVJ2AJoVpgCE6NGo63AP6NTN2PFf4RwpWSU+ThXCRB7HKKZURfxDWaiaKfjBepPw==",
       "requires": {
         "ajv": "4.11.8",
         "bigi": "1.4.2",

From 0c81790fa9a8be8694d97d4f6f4aa62dba202c8d Mon Sep 17 00:00:00 2001
From: Larry Salibra <larry@appartisan.com>
Date: Fri, 3 Nov 2017 15:21:43 +0900
Subject: [PATCH 24/24] update blockstack.js to v0.13.4

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4bc2eaa21..b005e18f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3004,9 +3004,9 @@
       }
     },
     "blockstack": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/blockstack/-/blockstack-0.13.3.tgz",
-      "integrity": "sha512-HvQEubCKW+qbJTK0ki/J7wgVJ2AJoVpgCE6NGo63AP6NTN2PFf4RwpWSU+ThXCRB7HKKZURfxDWaiaKfjBepPw==",
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/blockstack/-/blockstack-0.13.4.tgz",
+      "integrity": "sha512-CHWTKN/B97PHWKqyr/EQajyEWrSSHrZoXXnCSuLzJk3I/dkFoE0fSubRljL9r9N6fBrZ59OVKwPiB+4+KEAOXA==",
       "requires": {
         "ajv": "4.11.8",
         "bigi": "1.4.2",
diff --git a/package.json b/package.json
index 37016ac3c..82e3b727c 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "bigi": "^1.4.2",
     "bip39": "^2.2.0",
     "bitcoinjs-lib": "^3.2.0",
-    "blockstack": "0.13.3",
+    "blockstack": "0.13.4",
     "body-parser": "^1.16.1",
     "bootstrap": "^4.0.0-beta",
     "browser-stdout": "^1.3.0",