summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
authorMarie <marie@kaifa.ch>2024-02-19 08:33:10 +0000
committerMarie <marie@kaifa.ch>2024-02-19 08:33:10 +0000
commit764bbcf05bba2519d835d393942c1414fa2bb439 (patch)
treeb1c7669fb71bf79437917120ba2e0e6e784f9ef5 /packages/frontend/src
parentmerge: fix: keep alt text of file if present (!418) (diff)
parentSeemed to have fixed it (diff)
downloadsharkey-764bbcf05bba2519d835d393942c1414fa2bb439.tar.gz
sharkey-764bbcf05bba2519d835d393942c1414fa2bb439.tar.bz2
sharkey-764bbcf05bba2519d835d393942c1414fa2bb439.zip
merge: Bridged error message for when you try search for a post and it fails (!421)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/421 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Marie <marie@kaifa.ch>
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/os.ts15
1 files changed, 11 insertions, 4 deletions
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 010fdbb6d8..ab40c8bddb 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -109,10 +109,17 @@ export function promiseDialog<T extends Promise<any>>(
if (onFailure) {
onFailure(err);
} else {
- alert({
- type: 'error',
- text: err,
- });
+ if (err.message) {
+ alert({
+ type: 'error',
+ text: err.message,
+ });
+ } else {
+ alert({
+ type: 'error',
+ text: err,
+ });
+ }
}
});