Merge pull request #3343 from Expensify/main

android/app/build.gradle

@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001006108
-        versionName "1.0.61-8"
+        versionCode 1001006109
+        versionName "1.0.61-9"
     }
     splits {
         abi {

ios/ExpensifyCash/Info.plist

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

ios/ExpensifyCashTests/Info.plist

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.61-8",
+  "version": "1.0.61-9",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.cash",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/components/IOUConfirmationList.js

@@ -252,6 +252,7 @@ class IOUConfirmationList extends Component {
                         }]}
                         sections={this.getSections()}
                         disableArrowKeysActions
+                        disableRowInteractivity
                         hideAdditionalOptionStates
                         forceTextUnreadStyle
                         canSelectMultipleOptions={this.props.hasMultipleParticipants}

src/components/OptionsList.js

@@ -74,6 +74,9 @@ const propTypes = {
 
     /** Toggle between compact and default view of the option */
     optionMode: PropTypes.oneOf(['compact', 'default']),
+
+    /** Whether to disable the interactivity of the list's option row(s) */
+    disableRowInteractivity: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -94,6 +97,7 @@ const defaultProps = {
     innerRef: null,
     showTitleTooltip: false,
     optionMode: undefined,
+    disableRowInteractivity: false,
 };
 
 class OptionsList extends Component {
@@ -170,6 +174,7 @@ class OptionsList extends Component {
                 showSelectedState={this.props.canSelectMultipleOptions}
                 hideAdditionalOptionStates={this.props.hideAdditionalOptionStates}
                 forceTextUnreadStyle={this.props.forceTextUnreadStyle}
+                disableRowInteractivity={this.props.disableRowInteractivity}
             />
         );
     }

src/pages/home/sidebar/OptionRow.js

@@ -56,9 +56,12 @@ const propTypes = {
     /** Toggle between compact and default view */
     mode: PropTypes.oneOf(['compact', 'default']),
 
-    // Whether this option should be disabled
+    /** Whether this option should be disabled */
     isDisabled: PropTypes.bool,
 
+    /** Whether to disable the interactivity of this row */
+    disableRowInteractivity: PropTypes.bool,
+
     ...withLocalizePropTypes,
 };
 
@@ -74,6 +77,7 @@ const defaultProps = {
     onSelectRow: null,
     isDisabled: false,
     optionIsFocused: false,
+    disableRowInteractivity: false,
 };
 
 const OptionRow = ({
@@ -89,6 +93,7 @@ const OptionRow = ({
     showTitleTooltip,
     isDisabled,
     mode,
+    disableRowInteractivity,
     toLocalPhone,
 }) => {
     const textStyle = optionIsFocused
@@ -139,6 +144,7 @@ const OptionRow = ({
             {hovered => (
                 <TouchableOpacity
                     onPress={() => onSelectRow(option)}
+                    disabled={disableRowInteractivity}
                     activeOpacity={0.8}
                     style={[
                         styles.flexRow,