Skip to content

Commit

Permalink
Merge pull request #5665 from Expensify/OSBotify-cherry-pick-staging-…
Browse files Browse the repository at this point in the history
…5661
  • Loading branch information
OSBotify authored Oct 5, 2021
2 parents 003b849 + 4139fa4 commit 0face0e
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001010500
versionName "1.1.5-0"
versionCode 1001010501
versionName "1.1.5-1"
}
splits {
abi {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.1.5.0</string>
<string>1.1.5.1</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.1.5.0</string>
<string>1.1.5.1</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion 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.1.5-0",
"version": "1.1.5-1",
"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
5 changes: 4 additions & 1 deletion src/components/IOUConfirmationList.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,10 @@ class IOUConfirmationList extends Component {
}

componentDidMount() {
this.addVenmoPaymentOptionToMenu();
// Only add the Venmo option if we're sending a payment
if (this.props.iouType === CONST.IOU.IOU_TYPE.SEND) {
this.addVenmoPaymentOptionToMenu();
}
}

componentWillUnmount() {
Expand Down

0 comments on commit 0face0e

Please sign in to comment.