From 705d4d31fdbfcfdc4a1f997c2864ce23176419ef Mon Sep 17 00:00:00 2001
From: Shir Serlui <70711723+shirser121@users.noreply.github.com>
Date: Thu, 18 Aug 2022 19:20:30 +0300
Subject: [PATCH 1/2] Use getCommonGroups not contact (#1623)

---
 src/Client.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Client.js b/src/Client.js
index b36eb96..d3c9bb4 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -989,7 +989,13 @@ class Client extends EventEmitter {
      */
     async getCommonGroups(contactId) {
         const commonGroups = await this.pupPage.evaluate(async (contactId) => {
-            const contact = window.Store.Contact.get(contactId);
+            let contact = window.Store.Contact.get(contactId);
+            if (!contact) {
+                const wid = window.Store.WidFactory.createUserWid(contactId);
+                const chatConstructor = window.Store.Contact.getModelsArray().find(c=>!c.isGroup).constructor;
+                contact = new chatConstructor({id: wid});
+            }
+
             if (contact.commonGroups) {
                 return contact.commonGroups.serialize();
             }

From 62623347e8bcb23ba62ea43d36048b77cee10821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=BC=BA=20L=E1=B4=87G=CC=B8=E1=B4=87=C9=B4D=20=E0=BC=BB?=
 <39593002+jtourisNS@users.noreply.github.com>
Date: Thu, 18 Aug 2022 14:26:46 -0300
Subject: [PATCH 2/2] [Update] - adding catch block on promise for windows
 error (#1659)

---
 src/authStrategies/RemoteAuth.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/authStrategies/RemoteAuth.js b/src/authStrategies/RemoteAuth.js
index 5ae85cc..f84ba59 100644
--- a/src/authStrategies/RemoteAuth.js
+++ b/src/authStrategies/RemoteAuth.js
@@ -178,9 +178,9 @@ class RemoteAuth extends BaseAuthStrategy {
                         await fs.promises.rm(dirElement, {
                             recursive: true,
                             force: true
-                        });
+                        }).catch(() => {});
                     } else {
-                        await fs.promises.unlink(dirElement);
+                        await fs.promises.unlink(dirElement).catch(() => {});
                     }
                 }
             }