Use username as fallback for first/last, don't select frame on settings click

Author: jmwohl

src/components/sidebar/SidebarComponent.js

@@ -44,6 +44,7 @@ class SidebarComponent extends Component {
     		    			isSelected={frame.id == selectedFrameId} // TODO: === once we can ensure string ids
     		    			isOwner={frame.ownerId === user.id}
                   editFrameSettings={() => editFrameSettings(frame.id)}
+                  updateSidebarState={updateSidebarState}
                   selectFrame={selectFrame}
                   pathname={location.pathname} />
     		    	)}

src/components/sidebar/SidebarFrameItemComponent.js

@@ -17,8 +17,15 @@ class SidebarFrameItemComponent extends React.Component {
     selectFrame(frame.id);
   }
 
+  _editFrameSettings(e) {
+    let { editFrameSettings, updateSidebarState } = this.props;
+    e.stopPropagation();
+    updateSidebarState(false);
+    editFrameSettings();
+  }
+
   render() {
-    let {isSelected, editFrameSettings, isOwner, frame} = this.props;
+    let {isSelected, isOwner, frame} = this.props;
 
     let className = 'sidebar-frame-item sidebar__row sidebar__row--frame';
     className += isSelected ? ' sidebar_row--frame-active' : '';
@@ -37,10 +44,10 @@ class SidebarFrameItemComponent extends React.Component {
             : ''
           }
           { isOwner
-            ? <span className="sidebar-frame-item__settings" onClick={editFrameSettings}>
+            ? <span className="sidebar-frame-item__settings" onClick={::this._editFrameSettings}>
                 <img className="icon-settings" src={settingsIcon} />
               </span>
-            : <span className="sidebar-frame-item__settings" onClick={editFrameSettings}>
+            : <span className="sidebar-frame-item__settings" onClick={::this._editFrameSettings}>
                 <img className="icon-settings" src={settingsIcon} />
               </span>
           }

src/components/user/EditProfileFormComponent.js

@@ -97,11 +97,12 @@ class EditProfileFormComponent extends React.Component {
           <div className="form-group">
             <button href="#" className="btn btn-default btn-fw">{ _submitText }</button>
           </div>
-          { currentUser
-            &&
-            <div className="form-group">
-              <button className="btn btn-destructive btn-fw" onClick={::this._handleDeleteClick}>Delete Account</button>
-            </div>
+          {
+            // currentUser
+            // &&
+            // <div className="form-group">
+            //   <button className="btn btn-destructive btn-fw" onClick={::this._handleDeleteClick}>Delete Account</button>
+            // </div>
           }
       </form>
     );

src/components/user/ProfileHeaderComponent.js

@@ -16,7 +16,7 @@ class ProfileHeaderComponent extends React.Component {
 
     return (
       <div className="profile-header">
-        <div className="profile-header__name">{user.full_name}</div>
+        <div className="profile-header__name">{user.full_name || user.username}</div>
         { user.website || user.twitter
           ? <div className="profile-header__social">
             { user.website