Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/channel/bubbleMsgUtils.js

src/stores/ConversationStore.js

@@ -177,7 +177,7 @@ const websocketSlice = (set, get) => ({
       // addError('Error Connecting to Server');
       resultType = 'error';
     }
-    // console.log(resultType, '----result.type');
+
     const msgObj = receivedMsgTypeMapped[resultType].getMsg(result);
     const msgRender = receivedMsgTypeMapped[resultType].contentToRender(msgObj);
     const msgUpdate = receivedMsgTypeMapped[resultType].contentToUpdate(msgObj);