@nualang/nualang-ui-components 0.1.1227 → 0.1.1228

package/dist/Forms/CreateClassroom/CreateClassroom.js

@@ -25,7 +25,8 @@ function CreateClassroom({
     isUpgradePossible: true
   },
   learnLang,
-  verificationStatus
+  verificationStatus,
+  isVideoChatEnabled
 }) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_MultiStepForm.default, {
     initialValues: {
@@ -50,7 +51,8 @@ function CreateClassroom({
     forLanguages: forLanguages,
     fileSizeLimit: fileSizeLimit,
     subscription: subscription,
-    verificationStatus: verificationStatus
+    verificationStatus: verificationStatus,
+    isVideoChatEnabled: isVideoChatEnabled
   });
 }
 CreateClassroom.propTypes = {};

package/dist/Forms/CreateClassroom/Steps/ClassroomSettings/ClassroomSettings.js

@@ -25,21 +25,17 @@ function ClassroomSettings({
   classroomId,
   isUpdateClassroom = false,
   scrollToDiscuss = false,
-  setScrollToDiscuss
+  setScrollToDiscuss,
+  isVideoChatEnabled
 }) {
   const {
     visibility,
     enrolmentKey,
     allowedDomains,
     collaborators,
-    vchatEnabledInSettings,
-    vchatEnabled
+    vchatEnabledInSettings
   } = values;
   const vchatEnabledInSettingsRef = (0, _react.useRef)(null);
-  const [isWaysideClassroom, setIsWaysideClassroom] = (0, _react.useState)(false);
-  if (!isWaysideClassroom && classroomId && classroomId.toLowerCase().includes("wayside")) {
-    setIsWaysideClassroom(true);
-  }
   const generateRandomEnrolmentKey = () => {
     return String(Math.floor(Math.random() * 90000) + 10000);
   };
@@ -236,7 +232,7 @@ function ClassroomSettings({
             fullWidth: true
           })]
         })]
-      }), isWaysideClassroom && vchatEnabled !== false && /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Grid, {
+      }), isVideoChatEnabled && /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Grid, {
         item: true,
         xs: 12,
         md: 12,

package/dist/Forms/UpdateClassroom/UpdateClassroom.js

@@ -47,7 +47,8 @@ function UpdateClassroom({
   scrollToDiscuss,
   setScrollToDiscuss,
   isClassroomArchived = false,
-  verificationStatus
+  verificationStatus,
+  isVideoChatEnabled
 }) {
   const {
     classes
@@ -217,6 +218,7 @@ function UpdateClassroom({
                   values: values,
                   scrollToDiscuss: scrollToDiscuss,
                   setScrollToDiscuss: setScrollToDiscuss,
+                  isVideoChatEnabled: isVideoChatEnabled,
                   ...otherProps
                 })
               }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Divider, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.CardActions, {

package/dist/Screens/Classrooms/ViewClassroom/ViewClassroom.js

@@ -431,7 +431,9 @@ function Classroom({
     setSelectedDiscussion,
     meetingRecsData,
     hasBadLanguage,
-    handleArchiveSubmissions
+    handleArchiveSubmissions,
+    isVideoChatEnabled,
+    isVideoChatEnabledInSettings
   } = vchatProps;
   const isSmallScreen = (0, _useMediaQuery.default)("(max-width:410px)");
   const {
@@ -444,9 +446,7 @@ function Classroom({
   const [isPictureDialogOpen, setIsPictureDialogOpen] = (0, _react.useState)(false);
   const [overwriteValue, setOverwriteValue] = (0, _react.useState)(null);
   const [scrollToDiscuss, setScrollToDiscuss] = (0, _react.useState)(false);
-  const [isWaysideClassroom, setIsWaysideClassroom] = (0, _react.useState)(false);
-  const [isVideoChatEnabled, setIsVideoChatEnabled] = (0, _react.useState)(false);
-  const [isVideoChatEnabledInSettings, setIsVideoChatEnabledInSettings] = (0, _react.useState)(false);
+  const isWaysideClassroom = classroom?.classroomId?.toLowerCase().includes("wayside");
   const [isSubscriptionExpired, setIsSubscriptionExpired] = (0, _react.useState)(false);
   let tabs;
   (0, _react.useEffect)(() => {
@@ -721,8 +721,6 @@ function Classroom({
     picture,
     pictureXs,
     isCreator,
-    vchatEnabled,
-    vchatEnabledInSettings,
     createdBy,
     userImage,
     verificationStatus,
@@ -798,15 +796,6 @@ function Classroom({
     window.location.hash = "#Settings";
     setScrollToDiscuss(true);
   };
-  if (!isWaysideClassroom && classroomId && classroomId.toLowerCase().includes("wayside")) {
-    setIsWaysideClassroom(true);
-  }
-  if (!isVideoChatEnabled && (vchatEnabled === true || localStorage.getItem("vchat-enabled") === "true" || isCreator && vchatEnabled !== false || isMember && vchatEnabled !== false && vchatEnabledInSettings)) {
-    setIsVideoChatEnabled(true);
-  }
-  if (!isVideoChatEnabledInSettings && (isVideoChatEnabled && (vchatEnabledInSettings === true || vchatEnabled === true && isWaysideClassroom && vchatEnabledInSettings !== false) || localStorage.getItem("vchat-enabled") === "true")) {
-    setIsVideoChatEnabledInSettings(true);
-  }
   tabs = [{
     label: t("courses"),
     id: "Courses",
@@ -907,7 +896,7 @@ function Classroom({
         refreshAssignments: refreshAssignments
       })
     }, `tab-content-assignments`)
-  }] : []), ...(isWaysideClassroom && isVideoChatEnabled && isNualangLiveEnabled && (isMember && isVideoChatEnabledInSettings || isCreator) ? [{
+  }] : []), ...(isVideoChatEnabled && isNualangLiveEnabled && (isMember && isVideoChatEnabledInSettings || isCreator) ? [{
     label: t("discuss"),
     id: "Discuss",
     disabled: false,
@@ -1084,7 +1073,8 @@ function Classroom({
         setScrollToDiscuss: setScrollToDiscuss,
         isClassroomArchived: isArchived,
         classroomMembers: classroomMembers,
-        verificationStatus: verificationStatus
+        verificationStatus: verificationStatus,
+        isVideoChatEnabled: isVideoChatEnabled
       })
     }, `tab-content-settings`)
   }] : [])];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nualang/nualang-ui-components",
-  "version": "0.1.1227",
+  "version": "0.1.1228",
   "main": "dist/index.js",
   "files": [
     "dist",