Merge branch 'develop' into feature/auth

app/assets/javascripts/views/notes/notes_view.ts

@@ -328,7 +328,7 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesState> {
    * an index is roughly O(n^2).
    */
   private reloadNotesDisplayOptions() {
-    const tag = this.appState.selectedTag!;
+    const tag = this.appState.selectedTag;
     const searchText = this.getState().noteFilter.text.toLowerCase();
     const searchQuery = searchText ? {
       query: searchText,
@@ -337,7 +337,7 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesState> {
     const criteria = NotesDisplayCriteria.Create({
       sortProperty: this.state.sortBy! as CollectionSort,
       sortDirection: this.state.sortReverse! ? 'asc' : 'dsc',
-      tags: [tag],
+      tags: tag ? [tag] : [],
       includeArchived: this.getState().showArchived!,
       includePinned: !this.getState().hidePinned!,
       searchQuery: searchQuery

app/assets/javascripts/views/tags/tags_view.ts

@@ -246,12 +246,8 @@ class TagsViewCtrl extends PureViewCtrl<unknown, TagState> {
               this.selectTag(tag as SNTag);
             }
           } else if (data.item!.content_type === ContentType.SmartTag) {
-            this.application.createTemplateItem(
-              ContentType.SmartTag,
-              data.item!.content as PayloadContent
-            ).then(smartTag => {
-              this.selectTag(smartTag as SNSmartTag);
-            });
+            const matchingTag = this.getState().smartTags.find(t => t.uuid === data.item!.uuid);
+            this.selectTag(matchingTag as SNSmartTag);
           }
         } else if (action === ComponentAction.ClearSelection) {
           this.selectTag(this.getState().smartTags[0]);

app/assets/templates/directives/account-menu.pug

@@ -149,7 +149,7 @@
           .sk-panel-row
             .sk-panel-column
               .sk-h1.sk-bold.wrap {{self.state.user.email}}
-              .sk-subtitle.subtle.normal {{self.state.server}}
+              .sk-subtitle.neutral {{self.state.server}}
           .sk-panel-row
           a.sk-a.info.sk-panel-row.condensed(
             ng-click="self.openPasswordWizard()"
@@ -303,11 +303,11 @@
     .sk-panel-footer
       .sk-panel-row
         .sk-p.left.neutral
-          span.faded {{self.state.appVersion}}
+          span {{self.state.appVersion}}
           span(ng-if="self.state.showBetaWarning")
-            span.faded  (
+            span  (
             a.sk-a(ng-click="self.appState.disableBetaWarning()") Hide beta warning
-            span.faded )
+            span )
         a.sk-a.right(
           ng-click='self.hidePasswordForm()',
           ng-if='self.state.formData.showLogin || self.state.formData.showRegister'