Skip to content

Commit

Permalink
Merge pull request #20595 from Expensify/OSBotify-cherry-pick-staging…
Browse files Browse the repository at this point in the history
…-20553

🍒 Cherry pick PR #20553 to staging 🍒
  • Loading branch information
OSBotify authored Jun 12, 2023
2 parents ca3f61b + a7336ea commit 09a4109
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 14 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.3.26.1</string>
<string>1.3.26.2</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.3.26.1</string>
<string>1.3.26.2</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
2 changes: 0 additions & 2 deletions src/components/MoneyRequestConfirmationList.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ function MoneyRequestConfirmationList(props) {
data: [formattedPayeePersonalDetails],
shouldShow: true,
indexOffset: 0,
isDisabled: true,
},
{
title: translate('moneyRequestConfirmationList.whoWasThere'),
Expand Down Expand Up @@ -296,7 +295,6 @@ function MoneyRequestConfirmationList(props) {
selectedOptions={selectedOptions}
canSelectMultipleOptions={canModifyParticipants}
disableArrowKeysActions={!canModifyParticipants}
isDisabled={!canModifyParticipants}
boldStyle
shouldTextInputAppearBelowOptions
shouldShowTextInput={false}
Expand Down
7 changes: 6 additions & 1 deletion src/components/OptionRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const defaultProps = {
isSelected: false,
boldStyle: false,
showTitleTooltip: false,
onSelectRow: () => {},
onSelectRow: undefined,
isDisabled: false,
optionIsFocused: false,
style: null,
Expand Down Expand Up @@ -150,6 +150,10 @@ class OptionRow extends Component {
<PressableWithFeedback
ref={(el) => (pressableRef = el)}
onPress={(e) => {
if (!this.props.onSelectRow) {
return;
}

this.setState({isDisabled: true});
if (e) {
e.preventDefault();
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/components/OptionsList/optionsListPropTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const defaultProps = {
hideSectionHeaders: false,
disableFocusOptions: false,
boldStyle: false,
onSelectRow: () => {},
onSelectRow: undefined,
headerMessage: '',
innerRef: null,
showTitleTooltip: false,
Expand Down
2 changes: 1 addition & 1 deletion src/components/OptionsSelector/BaseOptionsSelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ class BaseOptionsSelector extends Component {
<OptionsList
ref={(el) => (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}
Expand Down
2 changes: 1 addition & 1 deletion src/components/OptionsSelector/optionsSelectorPropTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const propTypes = {
};

const defaultProps = {
onSelectRow: () => {},
onSelectRow: undefined,
textInputLabel: '',
placeholderText: '',
keyboardType: 'default',
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/WorkspaceMembersPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,6 @@ class WorkspaceMembersPage extends React.Component {
/>
<View style={styles.flex1}>
<OptionRow
isDisabled
boldStyle
option={{
text: this.props.formatPhoneNumber(item.displayName),
Expand All @@ -360,6 +359,7 @@ class WorkspaceMembersPage extends React.Component {
],
keyForList: item.login,
}}
onSelectRow={() => this.toggleUser(item.login, item.pendingAction)}
/>
</View>
{(this.props.session.email === item.login || item.role === 'admin') && (
Expand Down

0 comments on commit 09a4109

Please sign in to comment.