[bug fix] ErrorUtils: handle edge cases

ZeusLN · Apr 19, 2024 · 83f2032 · 83f2032
1 parent 0d5aeb4
commit 83f2032
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/utils/ErrorUtils.test.ts b/utils/ErrorUtils.test.ts
@@ -102,5 +102,15 @@ describe('ErrorUtils', () => {
                 )
             ).toEqual('Random message');
         });
+
+        it('Return string if error is sent as a string', () => {
+            expect(errorToUserFriendly('Payment timed out', false)).toEqual(
+                'Payment timed out'
+            );
+        });
+
+        it('To throw generic error if error is undefined', () => {
+            expect(errorToUserFriendly(undefined, false)).toEqual('Error');
+        });
     });
 });
diff --git a/utils/ErrorUtils.ts b/utils/ErrorUtils.ts
@@ -11,11 +11,12 @@ const userFriendlyErrors: any = {
     FAILURE_REASON_INCORRECT_PAYMENT_DETAILS:
         'error.failureReasonIncorrectPaymentDetails',
     FAILURE_REASON_INSUFFICIENT_BALANCE:
-        'error.failureReasonInsufficientBalance'
+        'error.failureReasonInsufficientBalance',
+    Error: 'general.error'
 };
 
 const errorToUserFriendly = (error: Error, localize = true) => {
-    let errorMessage: string = error.message;
+    let errorMessage: string = error?.message;
     let errorObject: any;
 
     try {
@@ -28,7 +29,8 @@ const errorToUserFriendly = (error: Error, localize = true) => {
         errorObject?.error?.message ||
         errorObject?.message ||
         errorMessage ||
-        error;
+        error ||
+        'Error';
 
     if (localize) {
         const localeString = require('./LocaleUtils').localeString;