From 622439c2d3c47fc45f759ef3159bcb5c6acb440e Mon Sep 17 00:00:00 2001
From: Dhruv Jain <dhruv.jain93@gmail.com>
Date: Sat, 14 Aug 2021 01:30:55 +0530
Subject: [PATCH 1/8] [NEW] Handle endCall and expandView control buttons

---
 src/components/Calls/CallIFrame.js | 12 +++++++++++-
 src/routes/Chat/component.js       |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/Calls/CallIFrame.js b/src/components/Calls/CallIFrame.js
index 64bac7d6c..49d7d53ee 100644
--- a/src/components/Calls/CallIFrame.js
+++ b/src/components/Calls/CallIFrame.js
@@ -8,7 +8,17 @@ import styles from './styles.scss';
 
 export const CallIframe = () => {
 	const { token, room } = store.state;
-	const url = `${ Livechat.client.host }/meet/${ room._id }?token=${ token }`;
+	const url = `${Livechat.client.host}/meet/${room._id}?token=${token}&layout=embedded`;
+	window.handleIframeClose = async () => {
+		return await store.setState({ incomingCallAlert: null });
+	};
+	window.expandCall = async () => {
+		window.open(
+			`${Livechat.client.host}/meet/${room._id}?token=${token}`,
+			room._id
+		);
+		return await store.setState({ incomingCallAlert: null });
+	};
 	return (
 		<div className={createClassName(styles, 'call-iframe')}>
 			<iframe className={createClassName(styles, 'call-iframe__content')} allow='camera;microphone' src={url} />
diff --git a/src/routes/Chat/component.js b/src/routes/Chat/component.js
index cfe0f1c81..c8fba3f47 100644
--- a/src/routes/Chat/component.js
+++ b/src/routes/Chat/component.js
@@ -150,7 +150,7 @@ export default class Chat extends Component {
 			>
 				<Screen.Content nopadding>
 					{ incomingCallAlert && !!incomingCallAlert.show && <CallNotification { ...incomingCallAlert } dispatch={dispatch} />}
-					{ ongoingCall && ongoingCall.callStatus === 'accept' ? <CallIframe { ...incomingCallAlert } /> : null }
+					{ incomingCallAlert && ongoingCall && ongoingCall.callStatus === 'accept' ? <CallIframe { ...incomingCallAlert } /> : null }
 					<div className={createClassName(styles, 'chat__messages', { atBottom, loading })}>
 						<MessageList
 							ref={this.handleMessagesContainerRef}

From 788698bb27ca2859a63807ada4910a6242bbaf98 Mon Sep 17 00:00:00 2001
From: Dhruv Jain <dhruv.jain93@gmail.com>
Date: Sat, 14 Aug 2021 11:56:57 +0530
Subject: [PATCH 2/8] [FIX] Lint errors

---
 src/components/Calls/CallIFrame.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/Calls/CallIFrame.js b/src/components/Calls/CallIFrame.js
index 49d7d53ee..cbb4aae06 100644
--- a/src/components/Calls/CallIFrame.js
+++ b/src/components/Calls/CallIFrame.js
@@ -8,16 +8,14 @@ import styles from './styles.scss';
 
 export const CallIframe = () => {
 	const { token, room } = store.state;
-	const url = `${Livechat.client.host}/meet/${room._id}?token=${token}&layout=embedded`;
-	window.handleIframeClose = async () => {
-		return await store.setState({ incomingCallAlert: null });
-	};
+	const url = `${ Livechat.client.host }/meet/${ room._id }?token=${ token }&layout=embedded`;
+	window.handleIframeClose = () => store.setState({ incomingCallAlert: null });
 	window.expandCall = async () => {
 		window.open(
-			`${Livechat.client.host}/meet/${room._id}?token=${token}`,
-			room._id
+			`${ Livechat.client.host }/meet/${ room._id }?token=${ token }`,
+			room._id,
 		);
-		return await store.setState({ incomingCallAlert: null });
+		return store.setState({ incomingCallAlert: null });
 	};
 	return (
 		<div className={createClassName(styles, 'call-iframe')}>

From e700efad6ad8c8516929aed7bc16382f86c622cc Mon Sep 17 00:00:00 2001
From: Dhruv Jain <dhruv.jain93@gmail.com>
Date: Sat, 14 Aug 2021 14:27:43 +0530
Subject: [PATCH 3/8] [FIX] Join Call Button giving call ended even when call
 inProgress

---
 src/components/Calls/CallIFrame.js | 22 +++++++++++++++++-----
 src/routes/Chat/component.js       |  2 +-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/components/Calls/CallIFrame.js b/src/components/Calls/CallIFrame.js
index cbb4aae06..e984737b4 100644
--- a/src/components/Calls/CallIFrame.js
+++ b/src/components/Calls/CallIFrame.js
@@ -7,15 +7,27 @@ import styles from './styles.scss';
 
 
 export const CallIframe = () => {
-	const { token, room } = store.state;
-	const url = `${ Livechat.client.host }/meet/${ room._id }?token=${ token }&layout=embedded`;
-	window.handleIframeClose = () => store.setState({ incomingCallAlert: null });
+	const { token, room, incomingCallAlert } = store.state;
+	const url = `${ Livechat.client.host }meet/${ room._id }?token=${ token }&layout=embedded`;
+	window.handleIframeClose = async () => store.setState({ incomingCallAlert: {
+		show: false,
+		callProvider: incomingCallAlert.callProvider,
+		callerUsername: incomingCallAlert.callerUsername,
+		rid: incomingCallAlert.rid,
+		time: incomingCallAlert.time,
+	} });
 	window.expandCall = async () => {
 		window.open(
-			`${ Livechat.client.host }/meet/${ room._id }?token=${ token }`,
+			`${ Livechat.client.host }meet/${ room._id }?token=${ token }`,
 			room._id,
 		);
-		return store.setState({ incomingCallAlert: null });
+		return store.setState({ incomingCallAlert: {
+			show: false,
+			callProvider: incomingCallAlert.callProvider,
+			callerUsername: incomingCallAlert.callerUsername,
+			rid: incomingCallAlert.rid,
+			time: incomingCallAlert.time,
+		} });
 	};
 	return (
 		<div className={createClassName(styles, 'call-iframe')}>
diff --git a/src/routes/Chat/component.js b/src/routes/Chat/component.js
index c8fba3f47..6be5cfa6b 100644
--- a/src/routes/Chat/component.js
+++ b/src/routes/Chat/component.js
@@ -150,7 +150,7 @@ export default class Chat extends Component {
 			>
 				<Screen.Content nopadding>
 					{ incomingCallAlert && !!incomingCallAlert.show && <CallNotification { ...incomingCallAlert } dispatch={dispatch} />}
-					{ incomingCallAlert && ongoingCall && ongoingCall.callStatus === 'accept' ? <CallIframe { ...incomingCallAlert } /> : null }
+					{ incomingCallAlert?.show && ongoingCall && ongoingCall.callStatus === 'accept' ? <CallIframe { ...incomingCallAlert } /> : null }
 					<div className={createClassName(styles, 'chat__messages', { atBottom, loading })}>
 						<MessageList
 							ref={this.handleMessagesContainerRef}

From 0dd36d385ecaf746a784d5ba747e813e73c78b17 Mon Sep 17 00:00:00 2001
From: Dhruv Jain <51796498+djcruz93@users.noreply.github.com>
Date: Sun, 15 Aug 2021 21:43:12 +0530
Subject: [PATCH 4/8] [FIX] slash omitted in the url

---
 src/components/Calls/CallIFrame.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Calls/CallIFrame.js b/src/components/Calls/CallIFrame.js
index e984737b4..dbfe6254a 100644
--- a/src/components/Calls/CallIFrame.js
+++ b/src/components/Calls/CallIFrame.js
@@ -8,7 +8,7 @@ import styles from './styles.scss';
 
 export const CallIframe = () => {
 	const { token, room, incomingCallAlert } = store.state;
-	const url = `${ Livechat.client.host }meet/${ room._id }?token=${ token }&layout=embedded`;
+	const url = `${ Livechat.client.host }/meet/${ room._id }?token=${ token }&layout=embedded`;
 	window.handleIframeClose = async () => store.setState({ incomingCallAlert: {
 		show: false,
 		callProvider: incomingCallAlert.callProvider,
@@ -18,7 +18,7 @@ export const CallIframe = () => {
 	} });
 	window.expandCall = async () => {
 		window.open(
-			`${ Livechat.client.host }meet/${ room._id }?token=${ token }`,
+			`${ Livechat.client.host }/meet/${ room._id }?token=${ token }`,
 			room._id,
 		);
 		return store.setState({ incomingCallAlert: {

From ff415ab98fbb7fc92f1c770351d8ae8c464b330c Mon Sep 17 00:00:00 2001
From: Dhruv Jain <dhruv.jain93@gmail.com>
Date: Mon, 16 Aug 2021 00:58:50 +0530
Subject: [PATCH 5/8] [REF] Remove redundant async keyword

---
 src/components/Calls/CallIFrame.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Calls/CallIFrame.js b/src/components/Calls/CallIFrame.js
index dbfe6254a..c76b49ebd 100644
--- a/src/components/Calls/CallIFrame.js
+++ b/src/components/Calls/CallIFrame.js
@@ -9,14 +9,14 @@ import styles from './styles.scss';
 export const CallIframe = () => {
 	const { token, room, incomingCallAlert } = store.state;
 	const url = `${ Livechat.client.host }/meet/${ room._id }?token=${ token }&layout=embedded`;
-	window.handleIframeClose = async () => store.setState({ incomingCallAlert: {
+	window.handleIframeClose = () => store.setState({ incomingCallAlert: {
 		show: false,
 		callProvider: incomingCallAlert.callProvider,
 		callerUsername: incomingCallAlert.callerUsername,
 		rid: incomingCallAlert.rid,
 		time: incomingCallAlert.time,
 	} });
-	window.expandCall = async () => {
+	window.expandCall = () => {
 		window.open(
 			`${ Livechat.client.host }/meet/${ room._id }?token=${ token }`,
 			room._id,

From b48cbec639ba9631eca92722d363d67ace831a09 Mon Sep 17 00:00:00 2001
From: Dhruv Jain <dhruv.jain93@gmail.com>
Date: Mon, 16 Aug 2021 01:07:04 +0530
Subject: [PATCH 6/8] [REF] Use spread operator, set ongoingCall status when
 expanding

---
 src/components/Calls/CallIFrame.js | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/components/Calls/CallIFrame.js b/src/components/Calls/CallIFrame.js
index c76b49ebd..e5a07ae13 100644
--- a/src/components/Calls/CallIFrame.js
+++ b/src/components/Calls/CallIFrame.js
@@ -9,25 +9,16 @@ import styles from './styles.scss';
 export const CallIframe = () => {
 	const { token, room, incomingCallAlert } = store.state;
 	const url = `${ Livechat.client.host }/meet/${ room._id }?token=${ token }&layout=embedded`;
-	window.handleIframeClose = () => store.setState({ incomingCallAlert: {
-		show: false,
-		callProvider: incomingCallAlert.callProvider,
-		callerUsername: incomingCallAlert.callerUsername,
-		rid: incomingCallAlert.rid,
-		time: incomingCallAlert.time,
-	} });
+	window.handleIframeClose = () => store.setState({ incomingCallAlert: { ...incomingCallAlert, show: false } });
 	window.expandCall = () => {
 		window.open(
 			`${ Livechat.client.host }/meet/${ room._id }?token=${ token }`,
 			room._id,
 		);
-		return store.setState({ incomingCallAlert: {
-			show: false,
-			callProvider: incomingCallAlert.callProvider,
-			callerUsername: incomingCallAlert.callerUsername,
-			rid: incomingCallAlert.rid,
-			time: incomingCallAlert.time,
-		} });
+		return store.setState({
+			incomingCallAlert: { ...incomingCallAlert, show: false },
+			ongoingCall: { ...ongoingCall, callStatus: "ongoingCallInNewTab" },
+		});
 	};
 	return (
 		<div className={createClassName(styles, 'call-iframe')}>

From 66b5cd73c0f821645965e4b7a93d2af26c166252 Mon Sep 17 00:00:00 2001
From: Dhruv Jain <51796498+djcruz93@users.noreply.github.com>
Date: Mon, 16 Aug 2021 22:03:30 +0530
Subject: [PATCH 7/8] [FIX] String enclosed within double quotes

Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
---
 src/components/Calls/CallIFrame.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Calls/CallIFrame.js b/src/components/Calls/CallIFrame.js
index e5a07ae13..30b4ed036 100644
--- a/src/components/Calls/CallIFrame.js
+++ b/src/components/Calls/CallIFrame.js
@@ -17,7 +17,7 @@ export const CallIframe = () => {
 		);
 		return store.setState({
 			incomingCallAlert: { ...incomingCallAlert, show: false },
-			ongoingCall: { ...ongoingCall, callStatus: "ongoingCallInNewTab" },
+			ongoingCall: { ...ongoingCall, callStatus: 'ongoingCallInNewTab' },
 		});
 	};
 	return (

From 164e5872bd8371317efea31d64543d70766c0a44 Mon Sep 17 00:00:00 2001
From: Dhruv Jain <dhruv.jain93@gmail.com>
Date: Tue, 17 Aug 2021 00:23:53 +0530
Subject: [PATCH 8/8] [FIX] ongoingCall variable not destructured but used

---
 src/components/Calls/CallIFrame.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Calls/CallIFrame.js b/src/components/Calls/CallIFrame.js
index 30b4ed036..bc68c0ed0 100644
--- a/src/components/Calls/CallIFrame.js
+++ b/src/components/Calls/CallIFrame.js
@@ -7,7 +7,7 @@ import styles from './styles.scss';
 
 
 export const CallIframe = () => {
-	const { token, room, incomingCallAlert } = store.state;
+	const { token, room, incomingCallAlert, ongoingCall } = store.state;
 	const url = `${ Livechat.client.host }/meet/${ room._id }?token=${ token }&layout=embedded`;
 	window.handleIframeClose = () => store.setState({ incomingCallAlert: { ...incomingCallAlert, show: false } });
 	window.expandCall = () => {