🍒 Cherry pick PR #9315 to staging 🍒

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001017102
-        versionName "1.1.71-2"
+        versionCode 1001017103
+        versionName "1.1.71-3"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.71.2</string>
+	<string>1.1.71.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.71.2</string>
+	<string>1.1.71.3</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.71-2",
+  "version": "1.1.71-3",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/components/VideoChatButtonAndMenu.js

@@ -4,6 +4,7 @@ import {
     View, Pressable, Dimensions, Linking,
 } from 'react-native';
 import PropTypes from 'prop-types';
+<<<<<<< HEAD:src/components/VideoChatButtonAndMenu.js
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
 import Popover from './Popover';
@@ -19,6 +20,33 @@ import compose from '../libs/compose';
 import Navigation from '../libs/Navigation/Navigation';
 import ROUTES from '../ROUTES';
 import Tooltip from './Tooltip';
+=======
+import Icon from '../Icon';
+import * as Expensicons from '../Icon/Expensicons';
+import Popover from '../Popover';
+import MenuItem from '../MenuItem';
+import ZoomIcon from '../../../assets/images/zoom-icon.svg';
+import GoogleMeetIcon from '../../../assets/images/google-meet.svg';
+import CONST from '../../CONST';
+import styles from '../../styles/styles';
+import themeColors from '../../styles/themes/default';
+import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions';
+import withLocalize, {withLocalizePropTypes} from '../withLocalize';
+import compose from '../../libs/compose';
+import Navigation from '../../libs/Navigation/Navigation';
+import ROUTES from '../../ROUTES';
+import Tooltip from '../Tooltip';
+import {propTypes as videoChatButtonAndMenuPropTypes, defaultProps} from './videoChatButtonAndMenuPropTypes';
+
+const propTypes = {
+    /** Link to open when user wants to create a new google meet meeting */
+    googleMeetURL: PropTypes.string.isRequired,
+
+    ...videoChatButtonAndMenuPropTypes,
+    ...withLocalizePropTypes,
+    ...windowDimensionsPropTypes,
+};
+>>>>>>> 99b2b8590 (Merge pull request #9315 from rushatgabhane/fix-console-error):src/components/VideoChatButtonAndMenu/BaseVideoChatButtonAndMenu.js
 
 const propTypes = {
     ...withLocalizePropTypes,

src/components/VideoChatButtonAndMenu/videoChatButtonAndMenuPropTypes.js

@@ -0,0 +1,12 @@
+import PropTypes from 'prop-types';
+
+const propTypes = {
+    /** If this is the Concierge chat, we'll open the modal for requesting a setup call instead of showing popover menu */
+    isConcierge: PropTypes.bool,
+};
+
+const defaultProps = {
+    isConcierge: false,
+};
+
+export {propTypes, defaultProps};