Merge branch 'develop' into feat/widget-v2

app/javascript/widget/components/PreChat/Form.vue

@@ -52,9 +52,13 @@ export default {
     ...mapGetters({
       widgetColor: 'appConfig/getWidgetColor',
       isCreating: 'conversation/getIsCreating',
+      isConversationRouting: 'appConfig/getIsUpdatingRoute',
       activeCampaign: 'campaign/getActiveCampaign',
       currentUser: 'contacts/getCurrentUser',
     }),
+    isCreatingConversation() {
+      return this.isCreating || this.isConversationRouting;
+    },
     textColor() {
       return getContrastingTextColor(this.widgetColor);
     },
@@ -337,9 +341,9 @@ export default {
       block
       :bg-color="widgetColor"
       :text-color="textColor"
-      :disabled="isCreating"
+      :disabled="isCreatingConversation"
     >
-      <Spinner v-if="isCreating" class="p-0" />
+      <Spinner v-if="isCreatingConversation" class="p-0" />
       {{ $t('START_CONVERSATION') }}
     </CustomButton>
   </FormKit>

app/javascript/widget/components/template/IntegrationCard.vue

@@ -14,10 +14,6 @@ export default {
       type: Number,
       required: true,
     },
-    meetingData: {
-      type: Object,
-      default: () => ({}),
-    },
   },
   data() {
     return { isLoading: false, dyteAuthToken: '', isSDKMounted: false };
@@ -28,18 +24,18 @@ export default {
       return getContrastingTextColor(this.widgetColor);
     },
     meetingLink() {
-      return buildDyteURL(this.meetingData.room_name, this.dyteAuthToken);
+      return buildDyteURL(this.dyteAuthToken);
     },
   },
   methods: {
     async joinTheCall() {
       this.isLoading = true;
       try {
-        const { data: { authResponse: { authToken = '' } = {} } = {} } =
-          await IntegrationAPIClient.addParticipantToDyteMeeting(
-            this.messageId
-          );
-        this.dyteAuthToken = authToken;
+        const response = await IntegrationAPIClient.addParticipantToDyteMeeting(
+          this.messageId
+        );
+        const { data: { token } = {} } = response;
+        this.dyteAuthToken = token;
       } catch (error) {
         // Ignore Error for now
       } finally {