From adcd023aafb77e5a4e26e154fcd744caf164b9c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Nov 2025 01:33:20 +0000
Subject: [PATCH 1/2] build(deps): bump glob from 10.4.5 to 10.5.0

Bumps [glob](https://github.com/isaacs/node-glob) from 10.4.5 to 10.5.0.
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v10.4.5...v10.5.0)

---
updated-dependencies:
- dependency-name: glob
  dependency-version: 10.5.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 372dba9b8f6..828cdf4fab4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5721,9 +5721,9 @@
       }
     },
     "node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {

From 4dbacda2536ddc4e07f93ddb7100609bbc7419ab Mon Sep 17 00:00:00 2001
From: Ioan Moldovan <ioan@flowcrypt.com>
Date: Thu, 20 Nov 2025 09:57:34 -0300
Subject: [PATCH 2/2] fix: test

---
 extension/js/common/platform/store/contact-store.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/js/common/platform/store/contact-store.ts b/extension/js/common/platform/store/contact-store.ts
index bc02e43bb66..5aa32228b7c 100644
--- a/extension/js/common/platform/store/contact-store.ts
+++ b/extension/js/common/platform/store/contact-store.ts
@@ -550,7 +550,7 @@ export class ContactStore extends AbstractStore {
     if (!db) {
       // relay op through background process
       // eslint-disable-next-line
-      return await BrowserMsg.send.bg.await.db({ f: 'getOneWithAllPubkeys', args: [email] });
+      return await BrowserMsg.retryOnBgNotReadyErr(() => BrowserMsg.send.bg.await.db({ f: 'getOneWithAllPubkeys', args: [email] }));
     }
     const tx = db.transaction(['emails', 'pubkeys', 'revocations'], 'readonly');
     const pubkeys: Pubkey[] = [];
@@ -608,7 +608,7 @@ export class ContactStore extends AbstractStore {
   public static async getPubkey(db: IDBDatabase | undefined, { id, family }: KeyIdentity): Promise<string | undefined> {
     if (!db) {
       // relay op through background process
-      return (await BrowserMsg.send.bg.await.db({ f: 'getPubkey', args: [{ id, family }] })) as string | undefined;
+      return (await BrowserMsg.retryOnBgNotReadyErr(() => BrowserMsg.send.bg.await.db({ f: 'getPubkey', args: [{ id, family }] }))) as string | undefined;
     }
     const internalFingerprint = ContactStore.getPubkeyId({ id, family });
     const tx = db.transaction(['pubkeys'], 'readonly');