From 142b5dfc1ba7d90b1edc84296440e1529f0e9794 Mon Sep 17 00:00:00 2001
From: Paul Frazee <pfrazee@gmail.com>
Date: Thu, 19 Jan 2023 17:55:00 -0600
Subject: Fix a case where the 'aborted' error message was getting through

---
 src/lib/errors.ts                     |  2 +-
 src/view/com/composer/ComposePost.tsx | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/errors.ts b/src/lib/errors.ts
index c14a2dbe4..216d5927b 100644
--- a/src/lib/errors.ts
+++ b/src/lib/errors.ts
@@ -1,4 +1,4 @@
 export function isNetworkError(e: unknown) {
   const str = String(e)
-  return str.includes('Aborted') || str.includes('Network request failed')
+  return str.includes('Abort') || str.includes('Network request failed')
 }
diff --git a/src/view/com/composer/ComposePost.tsx b/src/view/com/composer/ComposePost.tsx
index 3614267b1..0051d72a4 100644
--- a/src/view/com/composer/ComposePost.tsx
+++ b/src/view/com/composer/ComposePost.tsx
@@ -32,7 +32,11 @@ import {useStores} from '../../../state'
 import * as apilib from '../../../state/lib/api'
 import {ComposerOpts} from '../../../state/models/shell-ui'
 import {s, colors, gradients} from '../../lib/styles'
-import {detectLinkables, extractEntities} from '../../../lib/strings'
+import {
+  detectLinkables,
+  extractEntities,
+  cleanError,
+} from '../../../lib/strings'
 import {getLinkMeta} from '../../../lib/link-meta'
 import {downloadAndResize} from '../../../lib/images'
 import {UserLocalPhotosModel} from '../../../state/models/user-local-photos'
@@ -212,7 +216,7 @@ export const ComposePost = observer(function ComposePost({
   }
   const onPaste = async (err: string | undefined, files: PastedFile[]) => {
     if (err) {
-      return setError(err)
+      return setError(cleanError(err))
     }
     if (selectedPhotos.length >= 4) {
       return
@@ -249,7 +253,7 @@ export const ComposePost = observer(function ComposePost({
         setProcessingState,
       )
     } catch (e: any) {
-      setError(e.message)
+      setError(cleanError(e.message))
       setIsProcessing(false)
       return
     }
-- 
cgit 1.4.1