fix case when passcode was lost (#4535)

* fix case when passcode was lost in url based on input order
Azure · May 1, 2024 · 7f6e0ed · 7f6e0ed
1 parent bd1b846
commit 7f6e0ed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/samples/CallWithChat/src/app/views/HomeScreen.tsx b/samples/CallWithChat/src/app/views/HomeScreen.tsx
@@ -76,6 +76,10 @@ export const HomeScreen = (props: HomeScreenProps): JSX.Element => {
   const [meetingLocator, setMeetingLocator] = useState<
     TeamsMeetingLinkLocator | /* @conditional-compile-remove(meeting-id) */ TeamsMeetingIdLocator
   >();
+  /* @conditional-compile-remove(meeting-id) */
+  const [meetingId, setMeetingId] = useState<string>();
+  /* @conditional-compile-remove(meeting-id) */
+  const [passcode, setPasscode] = useState<string>();
 
   /* @conditional-compile-remove(PSTN-calls) */
   const [alternateCallerId, setAlternateCallerId] = useState<string>();
@@ -160,8 +164,7 @@ export const HomeScreen = (props: HomeScreenProps): JSX.Element => {
                   required
                   placeholder={'Enter a meeting id'}
                   onChange={(_, newValue) => {
-                    const passcode =
-                      meetingLocator && 'passcode' in meetingLocator ? meetingLocator.passcode : undefined;
+                    setMeetingId(newValue);
                     newValue
                       ? setMeetingLocator({ meetingId: newValue, passcode: passcode })
                       : setMeetingLocator(undefined);
@@ -177,8 +180,8 @@ export const HomeScreen = (props: HomeScreenProps): JSX.Element => {
                   label={'Passcode'}
                   placeholder={'Enter a meeting passcode'}
                   onChange={(_, newValue) => {
-                    const meetingId = meetingLocator && 'meetingId' in meetingLocator ? meetingLocator.meetingId : '';
                     // meeting id is required, but passcode is not
+                    setPasscode(newValue);
                     meetingId
                       ? setMeetingLocator({ meetingId: meetingId, passcode: newValue })
                       : setMeetingLocator(undefined);

diff --git a/samples/Calling/src/app/views/HomeScreen.tsx b/samples/Calling/src/app/views/HomeScreen.tsx
@@ -120,6 +120,10 @@ export const HomeScreen = (props: HomeScreenProps): JSX.Element => {
   const [callLocator, setCallLocator] = useState<
     TeamsMeetingLinkLocator | RoomLocator | /* @conditional-compile-remove(meeting-id) */ TeamsMeetingIdLocator
   >();
+  /* @conditional-compile-remove(meeting-id) */
+  const [meetingId, setMeetingId] = useState<string>();
+  /* @conditional-compile-remove(meeting-id) */
+  const [passcode, setPasscode] = useState<string>();
   const [chosenRoomsRoleOption, setRoomsRoleOption] = useState<IChoiceGroupOption>(roomRoleOptions[1]);
   /* @conditional-compile-remove(PSTN-calls) */
   const [alternateCallerId, setAlternateCallerId] = useState<string>();
@@ -231,7 +235,7 @@ export const HomeScreen = (props: HomeScreenProps): JSX.Element => {
                   required
                   placeholder={'Enter a meeting id'}
                   onChange={(_, newValue) => {
-                    const passcode = callLocator && 'passcode' in callLocator ? callLocator.passcode : undefined;
+                    setMeetingId(newValue);
                     newValue ? setCallLocator({ meetingId: newValue, passcode: passcode }) : setCallLocator(undefined);
                   }}
                 />
@@ -245,8 +249,8 @@ export const HomeScreen = (props: HomeScreenProps): JSX.Element => {
                   label={'Passcode'}
                   placeholder={'Enter a meeting passcode'}
                   onChange={(_, newValue) => {
-                    const meetingId = callLocator && 'meetingId' in callLocator ? callLocator.meetingId : '';
                     // meeting id is required, but passcode is not
+                    setPasscode(newValue);
                     meetingId
                       ? setCallLocator({ meetingId: meetingId, passcode: newValue })
                       : setCallLocator(undefined);