feat(prejoin): fix join meeting from external/calendar link while in another meeting (#15310)

If you are in meeting and you want to join another meeting from an external link, it is not possible.
That is because Prejoin screen didn't get unmounted, isJoining remains true and button is unpressable.
Most probably because react navigation, where the screen only gets focused or blurred.

android/gradle.properties

@@ -26,5 +26,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.bundle.enableUncompressedNativeLibs=false
 
-appVersion=99.0.0
-sdkVersion=0.0.0
+appVersion=24.6.0
+sdkVersion=10.3.0

ios/app/broadcast-extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>24.6.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

ios/app/src/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>24.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/app/watchos/app/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>24.6.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>UISupportedInterfaceOrientations</key>

ios/app/watchos/extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>24.6.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>

ios/sdk/src/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>10.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

ios/sdk/src/Lite-Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>10.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

react-native-sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jitsi/react-native-sdk",
-    "version": "0.0.0",
+    "version": "10.3.0",
     "description": "React Native SDK for Jitsi Meet.",
     "main": "index.tsx",
     "license": "Apache-2.0",
@@ -11,84 +11,84 @@
         "url": "git+https://github.com/jitsi/jitsi-meet.git"
     },
     "dependencies": {
-        "@braintree/sanitize-url": "0.0.0",
-        "@jitsi/js-utils": "0.0.0",
-        "@jitsi/logger": "0.0.0",
-        "@jitsi/rtcstats": "0.0.0",
-        "@react-navigation/bottom-tabs": "0.0.0",
-        "@react-navigation/elements": "0.0.0",
-        "@react-navigation/material-top-tabs": "0.0.0",
-        "@react-navigation/native": "0.0.0",
-        "@react-navigation/stack": "0.0.0",
-        "@stomp/stompjs": "0.0.0",
-        "@xmldom/xmldom": "0.0.0",
-        "base64-js": "0.0.0",
-        "grapheme-splitter": "0.0.0",
-        "i18n-iso-countries": "0.0.0",
-        "i18next": "0.0.0",
-        "js-md5": "0.0.0",
-        "i18next-http-backend": "0.0.0",
-        "js-sha512": "0.0.0",
-        "jwt-decode": "0.0.0",
-        "lib-jitsi-meet": "0.0.0",
-        "lodash-es": "0.0.0",
-        "moment": "0.0.0",
-        "moment-duration-format": "0.0.0",
-        "optional-require": "0.0.0",
-        "promise.allsettled": "0.0.0",
-        "punycode": "0.0.0",
-        "react-emoji-render": "0.0.0",
-        "react-i18next": "0.0.0",
-        "react-linkify": "0.0.0",
-        "react-native-dialog": "0.0.0",
-        "react-native-paper": "0.0.0",
-        "react-native-svg-transformer": "0.0.0",
-        "react-native-tab-view": "0.0.0",
-        "react-native-url-polyfill": "0.0.0",
-        "react-native-youtube-iframe": "0.0.0",
-        "react-redux": "0.0.0",
-        "redux": "0.0.0",
-        "redux-thunk": "0.0.0",
-        "text-encoding": "0.0.0",
-        "unorm": "0.0.0",
-        "util": "0.0.0",
-        "uuid": "0.0.0",
-        "zxcvbn": "0.0.0"
+        "@braintree/sanitize-url": "7.0.0",
+        "@jitsi/js-utils": "2.2.1",
+        "@jitsi/logger": "2.0.2",
+        "@jitsi/rtcstats": "9.5.1",
+        "@react-navigation/bottom-tabs": "6.6.0",
+        "@react-navigation/elements": "1.3.30",
+        "@react-navigation/material-top-tabs": "6.6.13",
+        "@react-navigation/native": "6.1.17",
+        "@react-navigation/stack": "6.4.0",
+        "@stomp/stompjs": "7.0.0",
+        "@xmldom/xmldom": "0.8.7",
+        "base64-js": "1.5.1",
+        "grapheme-splitter": "1.0.4",
+        "i18n-iso-countries": "6.8.0",
+        "i18next": "17.0.6",
+        "js-md5": "0.6.1",
+        "i18next-http-backend": "2.2.1",
+        "js-sha512": "0.8.0",
+        "jwt-decode": "2.2.0",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1883.0.0+9eefac11/lib-jitsi-meet.tgz",
+        "lodash-es": "4.17.21",
+        "moment": "2.29.4",
+        "moment-duration-format": "2.2.2",
+        "optional-require": "1.0.3",
+        "promise.allsettled": "1.0.4",
+        "punycode": "2.3.0",
+        "react-emoji-render": "2.0.1",
+        "react-i18next": "10.11.4",
+        "react-linkify": "1.0.0-alpha",
+        "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz",
+        "react-native-paper": "5.10.3",
+        "react-native-svg-transformer": "1.2.0",
+        "react-native-tab-view": "3.5.2",
+        "react-native-url-polyfill": "2.0.0",
+        "react-native-youtube-iframe": "2.3.0",
+        "react-redux": "7.2.9",
+        "redux": "4.0.4",
+        "redux-thunk": "2.4.1",
+        "text-encoding": "0.7.0",
+        "unorm": "1.6.0",
+        "util": "0.12.1",
+        "uuid": "8.3.2",
+        "zxcvbn": "4.4.2"
     },
     "peerDependencies": {
-        "@amplitude/react-native": "0.0.0",
-        "@giphy/react-native-sdk": "0.0.0",
+        "@amplitude/react-native": "2.17.3",
+        "@giphy/react-native-sdk": "2.3.0",
         "@react-native/metro-config": "*",
-        "@react-native-async-storage/async-storage": "0.0.0",
-        "@react-native-clipboard/clipboard": "0.0.0",
-        "@react-native-community/netinfo": "0.0.0",
-        "@react-native-community/slider": "0.0.0",
-        "@react-native-google-signin/google-signin": "0.0.0",
+        "@react-native-async-storage/async-storage": "1.23.1",
+        "@react-native-clipboard/clipboard": "1.14.1",
+        "@react-native-community/netinfo": "11.1.0",
+        "@react-native-community/slider": "4.4.3",
+        "@react-native-google-signin/google-signin": "10.1.0",
         "react-native": "*",
         "react": "*",
-        "react-native-background-timer": "0.0.0",
-        "react-native-calendar-events": "0.0.0",
-        "react-native-default-preference": "0.0.0",
-        "react-native-device-info": "0.0.0",
-        "react-native-get-random-values": "0.0.0",
-        "react-native-gesture-handler": "0.0.0",
-        "react-native-immersive-mode": "0.0.0",
-        "react-native-keep-awake": "0.0.0",
-        "react-native-pager-view": "0.0.0",
-        "react-native-performance": "0.0.0",
-        "react-native-orientation-locker": "0.0.0",
-        "react-native-safe-area-context": "0.0.0",
-        "react-native-screens": "0.0.0",
-        "react-native-sound": "0.0.0",
-        "react-native-splash-screen": "0.0.0",
-        "react-native-svg": "0.0.0",
-        "react-native-video": "0.0.0",
-        "react-native-watch-connectivity": "0.0.0",
-        "react-native-webrtc": "0.0.0",
-        "react-native-webview": "0.0.0"
+        "react-native-background-timer": "2.4.1",
+        "react-native-calendar-events": "2.2.0",
+        "react-native-default-preference": "1.4.4",
+        "react-native-device-info": "10.9.0",
+        "react-native-get-random-values": "1.9.0",
+        "react-native-gesture-handler": "2.18.1",
+        "react-native-immersive-mode": "2.0.2",
+        "react-native-keep-awake": "4.0.0",
+        "react-native-pager-view": "6.4.1",
+        "react-native-performance": "5.0.0",
+        "react-native-orientation-locker": "1.6.0",
+        "react-native-safe-area-context": "4.12.0",
+        "react-native-screens": "3.35.0",
+        "react-native-sound": "0.11.2",
+        "react-native-splash-screen": "3.3.0",
+        "react-native-svg": "13.13.0",
+        "react-native-video": "6.0.0-alpha.11",
+        "react-native-watch-connectivity": "1.1.0",
+        "react-native-webrtc": "124.0.4",
+        "react-native-webview": "13.8.7"
     },
     "overrides": {
-        "@xmldom/xmldom": "0.0.0"
+        "@xmldom/xmldom": "0.8.7"
     },
     "scripts": {
         "postinstall": "node sdk_instructions.js",
@@ -100,4 +100,4 @@
     "keywords": [
         "react-native"
     ]
-}
+}

react/features/prejoin/actionTypes.ts

@@ -39,16 +39,6 @@ export const SET_DIALOUT_STATUS = 'SET_DIALOUT_STATUS';
  */
 export const SET_JOIN_BY_PHONE_DIALOG_VISIBLITY = 'SET_JOIN_BY_PHONE_DIALOG_VISIBLITY';
 
-/**
- * Action type to disable the audio while on prejoin page.
- */
-export const SET_PREJOIN_AUDIO_DISABLED = 'SET_PREJOIN_AUDIO_DISABLED';
-
-/**
- * Action type to mute/unmute the audio while on prejoin page.
- */
-export const SET_PREJOIN_AUDIO_MUTED = 'SET_PREJOIN_AUDIO_MUTED';
-
 /**
  * Action type to set the errors while creating the prejoin streams.
  */

react/features/prejoin/components/native/Prejoin.tsx

@@ -70,8 +70,6 @@ const Prejoin: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProps) => {
     const showDisplayNameInput = useMemo(
         () => isDisplayNameVisible && (displayName || !isDisplayNameReadonly),
         [ displayName, isDisplayNameReadonly, isDisplayNameVisible ]);
-    const [ isJoining, setIsJoining ]
-        = useState(false);
     const onChangeDisplayName = useCallback(event => {
         const fieldValue = getFieldValue(event);
 
@@ -82,7 +80,6 @@ const Prejoin: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProps) => {
     }, [ displayName ]);
 
     const onJoin = useCallback(() => {
-        setIsJoining(true);
         dispatch(connect());
         navigateRoot(screen.conference.root);
     }, [ dispatch ]);
@@ -212,14 +209,14 @@ const Prejoin: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProps) => {
                     accessibilityLabel = 'prejoin.joinMeeting'
                     disabled = { showDisplayNameError }
                     labelKey = 'prejoin.joinMeeting'
-                    onClick = { isJoining ? undefined : maybeJoin }
+                    onClick = { maybeJoin }
                     style = { styles.joinButton }
                     type = { PRIMARY } />
                 <Button
                     accessibilityLabel = 'prejoin.joinMeetingInLowBandwidthMode'
                     disabled = { showDisplayNameError }
                     labelKey = 'prejoin.joinMeetingInLowBandwidthMode'
-                    onClick = { isJoining ? undefined : onJoinLowBandwidth }
+                    onClick = { onJoinLowBandwidth }
                     style = { styles.joinButton }
                     type = { TERTIARY } />
             </View>