From 5ce3dfc41670fd5559ba85b15411e4f2f15c186f Mon Sep 17 00:00:00 2001
From: Mohammed S <shoaib@push.org>
Date: Tue, 9 Jan 2024 16:40:31 +0530
Subject: [PATCH] fix: notification socket fix (#1004)

---
 packages/restapi/src/lib/pushstream/PushStream.ts   | 4 ++--
 packages/restapi/src/lib/pushstream/socketClient.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/restapi/src/lib/pushstream/PushStream.ts b/packages/restapi/src/lib/pushstream/PushStream.ts
index 2ba3de6fb..3f270fc3d 100644
--- a/packages/restapi/src/lib/pushstream/PushStream.ts
+++ b/packages/restapi/src/lib/pushstream/PushStream.ts
@@ -157,7 +157,7 @@ export class PushStream extends EventEmitter {
     if (shouldInitializeChatSocket) {
       if (!this.pushChatSocket) {
         // If pushChatSocket does not exist, create a new socket connection
-        this.pushChatSocket = createSocketConnection({
+        this.pushChatSocket = await createSocketConnection({
           user: walletToPCAIP10(this.account),
           socketType: 'chat',
           socketOptions: {
@@ -183,7 +183,7 @@ export class PushStream extends EventEmitter {
     if (shouldInitializeNotifSocket) {
       if (!this.pushNotificationSocket) {
         // If pushNotificationSocket does not exist, create a new socket connection
-        this.pushNotificationSocket = createSocketConnection({
+        this.pushNotificationSocket = await createSocketConnection({
           user: pCAIP10ToWallet(this.account),
           env: this.options?.env as ENV,
           socketOptions: {
diff --git a/packages/restapi/src/lib/pushstream/socketClient.ts b/packages/restapi/src/lib/pushstream/socketClient.ts
index 0cd68ba32..568dfe696 100644
--- a/packages/restapi/src/lib/pushstream/socketClient.ts
+++ b/packages/restapi/src/lib/pushstream/socketClient.ts
@@ -3,7 +3,7 @@ import { API_BASE_URL } from '../config';
 import { getCAIPAddress, walletToPCAIP10 } from '../helpers';
 import { SocketInputOptions } from './pushStreamTypes';
 
-export function createSocketConnection({
+export async function createSocketConnection({
   user,
   env,
   socketType = 'notification',
@@ -29,7 +29,7 @@ export function createSocketConnection({
     const userAddressInCAIP =
       socketType === 'chat'
         ? walletToPCAIP10(user)
-        : getCAIPAddress(env, user, 'User');
+        : await getCAIPAddress(env, user, 'User');
 
     const query =
       socketType === 'notification'