From e8eaa0f219f2c52fe3e9e3945e2a9d57a49938a8 Mon Sep 17 00:00:00 2001
From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com>
Date: Tue, 24 Nov 2020 11:40:41 +0100
Subject: [PATCH 1/4] chore(deps): upgrade snjs

---
 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 aeb48aefc..ffdeb6fc0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2574,9 +2574,9 @@
       }
     },
     "@standardnotes/snjs": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/@standardnotes/snjs/-/snjs-2.0.11.tgz",
-      "integrity": "sha512-5Ymdd8mez2DNFu4fRmbpZ4BXeFmFhiIFlwZURp8ZM+zqJFRwCo5SXu813DghAU3x51+cPwBMR/3kwuh9GouIpQ==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/@standardnotes/snjs/-/snjs-2.0.13.tgz",
+      "integrity": "sha512-yu97v5o25xPfdhvBhNGBhavEEO/hlVeQFcLb8cy6OVoTQrtUBpAmgcB+8DF1AMY/DJo/SDGM/DXcd/+jhjwOsw==",
       "requires": {
         "@standardnotes/sncrypto-common": "^1.2.9"
       }
diff --git a/package.json b/package.json
index 1faef881f..8be6b8d31 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
   "dependencies": {
     "@bugsnag/js": "^7.5.1",
     "@standardnotes/sncrypto-web": "^1.2.9",
-    "@standardnotes/snjs": "^2.0.11",
+    "@standardnotes/snjs": "^2.0.13",
     "mobx": "^6.0.1"
   }
 }

From a81234635fc1727c3664a74aed64fe15eedc69c1 Mon Sep 17 00:00:00 2001
From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com>
Date: Wed, 25 Nov 2020 13:16:11 +0100
Subject: [PATCH 2/4] fix: do not attempt to load bugsnag if no api key is set

---
 app/assets/javascripts/services/errorReporting.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/services/errorReporting.ts b/app/assets/javascripts/services/errorReporting.ts
index 8577376c9..50c439db5 100644
--- a/app/assets/javascripts/services/errorReporting.ts
+++ b/app/assets/javascripts/services/errorReporting.ts
@@ -4,6 +4,11 @@ import { storage, StorageKey } from './localStorage';
 import Bugsnag from '@bugsnag/js';
 
 declare const __VERSION__: string;
+declare global {
+  interface Window {
+    _bugsnag_api_key?: string;
+  }
+}
 
 function redactFilePath(line: string): string {
   const fileName = line.match(/\w+\.(html|js)/)?.[0];
@@ -16,13 +21,16 @@ function redactFilePath(line: string): string {
 }
 
 export function startErrorReporting() {
-  if (storage.get(StorageKey.DisableErrorReporting)) {
+  if (
+    storage.get(StorageKey.DisableErrorReporting) ||
+    !window._bugsnag_api_key
+  ) {
     SNLog.onError = console.error;
     return;
   }
   try {
     Bugsnag.start({
-      apiKey: (window as any)._bugsnag_api_key,
+      apiKey: window._bugsnag_api_key,
       appType: isDesktopApplication() ? 'desktop' : 'web',
       appVersion: __VERSION__,
       collectUserIp: false,

From ded5b510237a818f69541f5dfe2a24395aca9625 Mon Sep 17 00:00:00 2001
From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com>
Date: Wed, 25 Nov 2020 19:28:24 +0100
Subject: [PATCH 3/4] fix: correct tags ordering

---
 app/assets/javascripts/views/tags/tags_view.ts | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/assets/javascripts/views/tags/tags_view.ts b/app/assets/javascripts/views/tags/tags_view.ts
index aa2f2a29e..3b36dfb0d 100644
--- a/app/assets/javascripts/views/tags/tags_view.ts
+++ b/app/assets/javascripts/views/tags/tags_view.ts
@@ -103,17 +103,6 @@ class TagsViewCtrl extends PureViewCtrl<{}, TagState> {
     this.reloadNoteCounts();
   }
 
-  /**
-   * Returns all officially saved tags as reported by the model manager.
-   * @access private
-   */
-  getMappedTags() {
-    const tags = this.application.getItems(ContentType.Tag) as SNTag[];
-    return tags.sort((a, b) => {
-      return a.title < b.title ? -1 : 1;
-    });
-  }
-
   beginStreamingItems() {
     this.removeFoldersObserver = this.application.streamItems(
       [ContentType.Component],
@@ -126,7 +115,7 @@ class TagsViewCtrl extends PureViewCtrl<{}, TagState> {
       [ContentType.Tag, ContentType.SmartTag],
       async (items) => {
         await this.setState({
-          tags: this.getMappedTags(),
+          tags: this.application.getDisplayableItems(ContentType.Tag) as SNTag[],
           smartTags: this.application.getSmartTags(),
         });
 

From 0fc65ec5f0d1f0663f41a674f07ff49fee2957f1 Mon Sep 17 00:00:00 2001
From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com>
Date: Wed, 25 Nov 2020 19:31:26 +0100
Subject: [PATCH 4/4] chore(version): 3.5.10

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

diff --git a/package-lock.json b/package-lock.json
index ffdeb6fc0..f6a966113 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.5.9",
+  "version": "3.5.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8be6b8d31..869bc3c92 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.5.9",
+  "version": "3.5.10",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",