Merge branch 'release/3.8.5' into main

app/assets/javascripts/directives/views/accountMenu.ts

@@ -228,8 +228,7 @@ class AccountMenuCtrl extends PureViewCtrl<unknown, AccountMenuState> {
 
   onHostInputChange() {
     const url = this.getState().formData.url!;
-    this.application!.setHost(url);
-    this.application!.setNextVersionHost(url);
+    this.application!.setCustomHost(url);
   }
 
   refreshEncryptionStatus() {

app/assets/javascripts/services/autolock_service.ts

@@ -1,5 +1,4 @@
 import { ApplicationService } from '@standardnotes/snjs';
-import { isDesktopApplication } from '@/utils';
 
 const MILLISECONDS_PER_SECOND = 1000;
 const POLL_INTERVAL = 50;
@@ -18,9 +17,7 @@ export class AutolockService extends ApplicationService {
   private lockAfterDate?: Date
 
   onAppLaunch() {
-    if (!isDesktopApplication()) {
-      this.beginPolling();
-    }
+    this.beginPolling();
     return super.onAppLaunch();
   }
 

package.json

@@ -71,7 +71,7 @@
     "@reach/checkbox": "^0.13.2",
     "@reach/dialog": "^0.13.0",
     "@standardnotes/sncrypto-web": "1.2.10",
-    "@standardnotes/snjs": "2.7.1",
+    "@standardnotes/snjs": "2.7.3",
     "mobx": "^6.1.6",
     "mobx-react-lite": "^3.2.0",
     "preact": "^10.5.12"

yarn.lock

@@ -1936,10 +1936,10 @@
     "@standardnotes/sncrypto-common" "^1.2.7"
     libsodium-wrappers "^0.7.8"
 
-"@standardnotes/snjs@2.7.1":
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.1.tgz#e8073942fe9a8f762989ab75df94407b9934ea3e"
-  integrity sha512-kCZU4Tx6vNYcEeh22ax8Vfr/LYEbgAqI9nSC6jB8MTg6nJzCuh4b/nngW+yVUz91phu156XN0YeMyj7HJ3DWVw==
+"@standardnotes/snjs@2.7.3":
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.3.tgz#3b8d4bbcb0d841e02726193c4540d1b11d772249"
+  integrity sha512-YzD9/lxUS4nn922gR03/UHL9shqsyqikx+4Ud9v4IqtGEwKpusny4ecKPtvdbot/nedqEKpMZzrqT7xeNiRKqQ==
   dependencies:
     "@standardnotes/auth" "^2.0.0"
     "@standardnotes/sncrypto-common" "^1.2.9"