From d168d5ee9b2525c3290e2f65e6de8337eff9fbe2 Mon Sep 17 00:00:00 2001
From: Colton Hurst <colton@coltonhurst.com>
Date: Tue, 27 Sep 2022 11:09:48 -0400
Subject: [PATCH] Fix last seen & spacing issue (#3567)

* Fix last seen & spacing issue

* Address PR comments, moving try catch to config service
---
 apps/browser/src/_locales/en/messages.json       |  2 +-
 .../src/popup/settings/about.component.html      |  6 +++---
 .../common/src/services/config/config.service.ts | 16 +++++++++-------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index a23bfa56501..3749bb4ae00 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -2017,7 +2017,7 @@
     }
   },
   "lastSeenOn": {
-    "message": "last seen on $DATE$",
+    "message": "last seen on: $DATE$",
     "placeholders": {
       "date": {
         "content": "$1",
diff --git a/apps/browser/src/popup/settings/about.component.html b/apps/browser/src/popup/settings/about.component.html
index ed2ceb40bec..c11b68e9c1f 100644
--- a/apps/browser/src/popup/settings/about.component.html
+++ b/apps/browser/src/popup/settings/about.component.html
@@ -14,7 +14,7 @@
           <p class="text-center" *ngIf="isCloud">
             {{ "serverVersion" | i18n }}: {{ this.serverConfig?.version }}
             <span *ngIf="!serverConfig.isValid()">
-              ({{ "lastSeenOn" | i18n }}: {{ serverConfig.utcDate | date: "mediumDate" }})
+              ({{ "lastSeenOn" | i18n: (serverConfig.utcDate | date: "mediumDate") }})
             </span>
           </p>
 
@@ -24,7 +24,7 @@
                 {{ "serverVersion" | i18n }} <small>({{ "thirdParty" | i18n }})</small>:
                 {{ this.serverConfig?.version }}
                 <span *ngIf="!serverConfig.isValid()">
-                  ({{ "lastSeenOn" | i18n }}: {{ serverConfig.utcDate | date: "mediumDate" }})
+                  ({{ "lastSeenOn" | i18n: (serverConfig.utcDate | date: "mediumDate") }})
                 </span>
               </p>
               <div class="text-center">
@@ -36,7 +36,7 @@
               {{ "serverVersion" | i18n }} <small>({{ "selfHosted" | i18n }})</small>:
               {{ this.serverConfig?.version }}
               <span *ngIf="!serverConfig.isValid()">
-                ({{ "lastSeenOn" | i18n }}: {{ serverConfig.utcDate | date: "mediumDate" }})
+                ({{ "lastSeenOn" | i18n: (serverConfig.utcDate | date: "mediumDate") }})
               </span>
             </p>
           </ng-container>
diff --git a/libs/common/src/services/config/config.service.ts b/libs/common/src/services/config/config.service.ts
index 9f9e0938b5a..a5ac5445713 100644
--- a/libs/common/src/services/config/config.service.ts
+++ b/libs/common/src/services/config/config.service.ts
@@ -48,14 +48,16 @@ export class ConfigService implements ConfigServiceAbstraction {
   }
 
   private async fetchServerConfig(): Promise<ServerConfig> {
-    const response = await this.configApiService.get();
-    const data = new ServerConfigData(response);
+    try {
+      const response = await this.configApiService.get();
 
-    if (data != null) {
-      await this.stateService.setServerConfig(data);
-      return new ServerConfig(data);
+      if (response != null) {
+        const data = new ServerConfigData(response);
+        await this.stateService.setServerConfig(data);
+        return new ServerConfig(data);
+      }
+    } catch {
+      return null;
     }
-
-    return null;
   }
 }