Merge fb7caf8 into 6fb1f77

invertase · Nov 26, 2020 · 3ae4154 · 3ae4154
2 parents 6fb1f77 + fb7caf8
commit 3ae4154
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/packages/app/lib/internal/NativeFirebaseError.js b/packages/app/lib/internal/NativeFirebaseError.js
@@ -59,7 +59,10 @@ export default class NativeFirebaseError extends Error {
       value: userInfo.nativeErrorMessage || null,
     });
 
-    this.stack = this.getStackWithMessage(`NativeFirebaseError: ${this.message}`);
+    this.stack = NativeFirebaseError.getStackWithMessage(
+      `NativeFirebaseError: ${this.message}`,
+      this.jsStack,
+    );
 
     // Unused
     // this.nativeStackIOS = nativeError.nativeStackIOS;
@@ -71,7 +74,7 @@ export default class NativeFirebaseError extends Error {
    *
    * @returns {string}
    */
-  getStackWithMessage(message) {
-    return [message, ...this.jsStack.split('\n').slice(2, 13)].join('\n');
+  static getStackWithMessage(message, jsStack) {
+    return [message, ...jsStack.split('\n').slice(2, 13)].join('\n');
   }
 }
diff --git a/packages/functions/lib/HttpsError.js b/packages/functions/lib/HttpsError.js
@@ -15,6 +15,8 @@
  *
  */
 
+import { NativeFirebaseError } from '@react-native-firebase/app/lib/internal';
+
 export default class HttpsError extends Error {
   constructor(code, message, details, nativeErrorInstance) {
     super(message);
@@ -34,6 +36,9 @@ export default class HttpsError extends Error {
       value: message,
     });
 
-    this.stack = nativeErrorInstance.getStackWithMessage(`Error: ${this.message}`);
+    this.stack = NativeFirebaseError.getStackWithMessage(
+      `Error: ${this.message}`,
+      nativeErrorInstance.jsStack,
+    );
   }
 }