Skip to content

Commit 1eec3c9

Browse files
committedSep 27, 2022
Fix last seen & spacing issue (#3567)
* Fix last seen & spacing issue * Address PR comments, moving try catch to config service (cherry picked from commit d168d5e)
1 parent 2357957 commit 1eec3c9

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed
 

‎apps/browser/src/_locales/en/messages.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2017,7 +2017,7 @@
20172017
}
20182018
},
20192019
"lastSeenOn": {
2020-
"message": "last seen on $DATE$",
2020+
"message": "last seen on: $DATE$",
20212021
"placeholders": {
20222022
"date": {
20232023
"content": "$1",

‎apps/browser/src/popup/settings/about.component.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<p class="text-center" *ngIf="isCloud">
1515
{{ "serverVersion" | i18n }}: {{ this.serverConfig?.version }}
1616
<span *ngIf="!serverConfig.isValid()">
17-
({{ "lastSeenOn" | i18n }}: {{ serverConfig.utcDate | date: "mediumDate" }})
17+
({{ "lastSeenOn" | i18n: (serverConfig.utcDate | date: "mediumDate") }})
1818
</span>
1919
</p>
2020

@@ -24,7 +24,7 @@
2424
{{ "serverVersion" | i18n }} <small>({{ "thirdParty" | i18n }})</small>:
2525
{{ this.serverConfig?.version }}
2626
<span *ngIf="!serverConfig.isValid()">
27-
({{ "lastSeenOn" | i18n }}: {{ serverConfig.utcDate | date: "mediumDate" }})
27+
({{ "lastSeenOn" | i18n: (serverConfig.utcDate | date: "mediumDate") }})
2828
</span>
2929
</p>
3030
<div class="text-center">
@@ -36,7 +36,7 @@
3636
{{ "serverVersion" | i18n }} <small>({{ "selfHosted" | i18n }})</small>:
3737
{{ this.serverConfig?.version }}
3838
<span *ngIf="!serverConfig.isValid()">
39-
({{ "lastSeenOn" | i18n }}: {{ serverConfig.utcDate | date: "mediumDate" }})
39+
({{ "lastSeenOn" | i18n: (serverConfig.utcDate | date: "mediumDate") }})
4040
</span>
4141
</p>
4242
</ng-container>

‎libs/common/src/services/config/config.service.ts

+10-8
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,16 @@ export class ConfigService implements ConfigServiceAbstraction {
4848
}
4949

5050
private async fetchServerConfig(): Promise<ServerConfig> {
51-
const response = await this.configApiService.get();
52-
const data = new ServerConfigData(response);
53-
54-
if (data != null) {
55-
await this.stateService.setServerConfig(data);
56-
return new ServerConfig(data);
51+
try {
52+
const response = await this.configApiService.get();
53+
54+
if (response != null) {
55+
const data = new ServerConfigData(response);
56+
await this.stateService.setServerConfig(data);
57+
return new ServerConfig(data);
58+
}
59+
} catch {
60+
return null;
5761
}
58-
59-
return null;
6062
}
6163
}

0 commit comments

Comments
 (0)
Please sign in to comment.