diff --git a/android/app/build.gradle b/android/app/build.gradle index c29f64297d23..2b00f3bfd1cc 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -106,8 +106,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001032601 - versionName "1.3.26-1" + versionCode 1001032602 + versionName "1.3.26-2" } splits { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 4a2406aaa1b8..019353c4e63d 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1.3.26.1 + 1.3.26.2 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 591c2f2b999a..9c07699438fe 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.3.26.1 + 1.3.26.2 diff --git a/package-lock.json b/package-lock.json index 61bb8d860991..9de2df2b90a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.3.26-1", + "version": "1.3.26-2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.3.26-1", + "version": "1.3.26-2", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 393e3be8e186..d82fff18b9d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.3.26-1", + "version": "1.3.26-2", "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.", diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js index 3fca7f714be7..f8006788bbac 100755 --- a/src/components/MoneyRequestConfirmationList.js +++ b/src/components/MoneyRequestConfirmationList.js @@ -166,7 +166,6 @@ function MoneyRequestConfirmationList(props) { data: [formattedPayeePersonalDetails], shouldShow: true, indexOffset: 0, - isDisabled: true, }, { title: translate('moneyRequestConfirmationList.whoWasThere'), @@ -296,7 +295,6 @@ function MoneyRequestConfirmationList(props) { selectedOptions={selectedOptions} canSelectMultipleOptions={canModifyParticipants} disableArrowKeysActions={!canModifyParticipants} - isDisabled={!canModifyParticipants} boldStyle shouldTextInputAppearBelowOptions shouldShowTextInput={false} diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js index 453e28a6271e..911df881f600 100644 --- a/src/components/OptionRow.js +++ b/src/components/OptionRow.js @@ -67,7 +67,7 @@ const defaultProps = { isSelected: false, boldStyle: false, showTitleTooltip: false, - onSelectRow: () => {}, + onSelectRow: undefined, isDisabled: false, optionIsFocused: false, style: null, @@ -150,6 +150,10 @@ class OptionRow extends Component { (pressableRef = el)} onPress={(e) => { + if (!this.props.onSelectRow) { + return; + } + this.setState({isDisabled: true}); if (e) { e.preventDefault(); @@ -171,6 +175,7 @@ class OptionRow extends Component { this.props.shouldDisableRowInnerPadding ? null : styles.sidebarLinkInner, this.props.optionIsFocused ? styles.sidebarLinkActive : null, this.props.shouldHaveOptionSeparator && styles.borderTop, + !this.props.onSelectRow && !this.props.isDisabled ? styles.cursorDefault : null, ]} accessibilityLabel={this.props.option.text} accessibilityRole="button" diff --git a/src/components/OptionsList/optionsListPropTypes.js b/src/components/OptionsList/optionsListPropTypes.js index 915d84e058c3..e6e507f4da09 100644 --- a/src/components/OptionsList/optionsListPropTypes.js +++ b/src/components/OptionsList/optionsListPropTypes.js @@ -88,7 +88,7 @@ const defaultProps = { hideSectionHeaders: false, disableFocusOptions: false, boldStyle: false, - onSelectRow: () => {}, + onSelectRow: undefined, headerMessage: '', innerRef: null, showTitleTooltip: false, diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js index df15ad71febc..337674012106 100755 --- a/src/components/OptionsSelector/BaseOptionsSelector.js +++ b/src/components/OptionsSelector/BaseOptionsSelector.js @@ -305,7 +305,7 @@ class BaseOptionsSelector extends Component { (this.list = el)} optionHoveredStyle={this.props.optionHoveredStyle} - onSelectRow={this.selectRow} + onSelectRow={this.props.onSelectRow ? this.selectRow : undefined} sections={this.props.sections} focusedIndex={this.state.focusedIndex} selectedOptions={this.props.selectedOptions} diff --git a/src/components/OptionsSelector/optionsSelectorPropTypes.js b/src/components/OptionsSelector/optionsSelectorPropTypes.js index bc7436e3dba8..02b807bf66c1 100644 --- a/src/components/OptionsSelector/optionsSelectorPropTypes.js +++ b/src/components/OptionsSelector/optionsSelectorPropTypes.js @@ -109,7 +109,7 @@ const propTypes = { }; const defaultProps = { - onSelectRow: () => {}, + onSelectRow: undefined, textInputLabel: '', placeholderText: '', keyboardType: 'default', diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js index 19db6d28bb70..4db6f45e7e4c 100644 --- a/src/pages/workspace/WorkspaceMembersPage.js +++ b/src/pages/workspace/WorkspaceMembersPage.js @@ -345,7 +345,6 @@ class WorkspaceMembersPage extends React.Component { /> this.toggleUser(item.login, item.pendingAction)} /> {(this.props.session.email === item.login || item.role === 'admin') && (