fix: Merge branch 'main' into deployment

push-protocol · Jan 9, 2024 · 5d76487 · 5d76487
2 parents a5bc149 + 5ce3dfc
commit 5d76487
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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'