🍒 Cherry pick PR #9610 to staging 🍒

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001017902
-        versionName "1.1.79-2"
+        versionCode 1001017903
+        versionName "1.1.79-3"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.79.2</string>
+	<string>1.1.79.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.79.2</string>
+	<string>1.1.79.3</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.79-2",
+  "version": "1.1.79-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/OptionsSelector.js

@@ -95,12 +95,6 @@ const propTypes = {
     /** Text to show in the confirm button (only visible if multiple options are selected) */
     confirmButtonText: PropTypes.string,
 
-    /** True if the maximum number of options have been selected, false otherwise. */
-    maxParticipantsReached: PropTypes.bool,
-
-    /** Text to show if the maximum number of participants are reached */
-    maxParticipantsReachedMessage: PropTypes.string,
-
     /** Function to execute if the confirm button is pressed */
     onConfirmSelection: PropTypes.func,
 
@@ -138,8 +132,6 @@ const defaultProps = {
     autoFocus: true,
     shouldShowConfirmButton: false,
     confirmButtonText: undefined,
-    maxParticipantsReached: false,
-    maxParticipantsReachedMessage: undefined,
     onConfirmSelection: () => {},
     shouldTextInputAppearBelowOptions: false,
     shouldShowOfflineMessage: false,
@@ -332,10 +324,6 @@ class OptionsSelector extends Component {
             ? this.props.translate('common.confirm')
             : this.props.confirmButtonText;
         const shouldShowDefaultConfirmButton = !this.props.footerContent && defaultConfirmButtonText;
-        const defaultMaxParticipantsReachedMessage = _.isUndefined(this.props.maxParticipantsReachedMessage)
-            ? this.props.translate('common.maxParticipantsReached', {count: this.props.selectedOptions.length})
-            : this.props.maxParticipantsReachedMessage;
-        const shouldShowMaxParticipantsMessage = this.props.maxParticipantsReached && defaultMaxParticipantsReachedMessage;
         const textInput = (
             <TextInput
                 ref={el => this.textInput = el}
@@ -404,12 +392,7 @@ class OptionsSelector extends Component {
                 </View>
                 {shouldShowFooter && (
                     <FixedFooter>
-                        {shouldShowMaxParticipantsMessage && (
-                            <Text style={[styles.textLabelSupporting, styles.textAlignCenter, styles.mt1, styles.mb3]}>
-                                {defaultMaxParticipantsReachedMessage}
-                            </Text>
-                        )}
-                        {!shouldShowMaxParticipantsMessage && this.props.shouldShowOfflineMessage && this.props.network.isOffline && (
+                        {this.props.shouldShowOfflineMessage && this.props.network.isOffline && (
                             <Text style={[styles.formError, styles.pb2]}>
                                 {this.props.translate('session.offlineMessage')}
                             </Text>

src/pages/NewChatPage.js

@@ -255,7 +255,6 @@ class NewChatPage extends Component {
                                     shouldFocusOnSelectRow={this.props.isGroupChat}
                                     shouldShowConfirmButton={this.props.isGroupChat}
                                     confirmButtonText={this.props.translate('newChatPage.createGroup')}
-                                    maxParticipantsReached={maxParticipantsReached}
                                     onConfirmSelection={this.props.isGroupChat ? this.createGroup : this.createChat}
                                 />
                             )}

src/pages/iou/IOUCurrencySelection.js

@@ -74,7 +74,6 @@ class IOUCurrencySelection extends Component {
     /**
      * Returns the sections needed for the OptionsSelector
      *
-     * @param {Boolean} maxParticipantsReached
      * @returns {Array}
      */
     getSections() {

src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js

@@ -229,7 +229,6 @@ class IOUParticipantsSplit extends Component {
                         shouldDelayFocus
                         shouldShowConfirmButton
                         confirmButtonText={this.props.translate('common.next')}
-                        maxParticipantsReached={maxParticipantsReached}
                         onConfirmSelection={this.finalizeParticipants}
                     />
                 </View>