From e0551fa13c9ae1556edf0ffb967f2f9e661f18a0 Mon Sep 17 00:00:00 2001
From: Christina Holland <chholland@google.com>
Date: Mon, 1 May 2023 11:59:29 -0700
Subject: [PATCH] Catch more heartbeat read/write errors (#7272)

---
 .changeset/sixty-dolls-report.md | 5 +++++
 packages/app/src/indexeddb.ts    | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/sixty-dolls-report.md

diff --git a/.changeset/sixty-dolls-report.md b/.changeset/sixty-dolls-report.md
new file mode 100644
index 00000000000..bea316d978e
--- /dev/null
+++ b/.changeset/sixty-dolls-report.md
@@ -0,0 +1,5 @@
+---
+'@firebase/app': patch
+---
+
+Catch more heartbeat read/write errors.
diff --git a/packages/app/src/indexeddb.ts b/packages/app/src/indexeddb.ts
index 761a39bc15a..6733aa62460 100644
--- a/packages/app/src/indexeddb.ts
+++ b/packages/app/src/indexeddb.ts
@@ -62,10 +62,11 @@ export async function readHeartbeatsFromIndexedDB(
 ): Promise<HeartbeatsInIndexedDB | undefined> {
   try {
     const db = await getDbPromise();
-    return db
+    const result = await db
       .transaction(STORE_NAME)
       .objectStore(STORE_NAME)
-      .get(computeKey(app)) as Promise<HeartbeatsInIndexedDB | undefined>;
+      .get(computeKey(app));
+    return result;
   } catch (e) {
     if (e instanceof FirebaseError) {
       logger.warn(e.message);
@@ -87,7 +88,7 @@ export async function writeHeartbeatsToIndexedDB(
     const tx = db.transaction(STORE_NAME, 'readwrite');
     const objectStore = tx.objectStore(STORE_NAME);
     await objectStore.put(heartbeatObject, computeKey(app));
-    return tx.done;
+    await tx.done;
   } catch (e) {
     if (e instanceof FirebaseError) {
       logger.warn(e.message);