Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update version to 1.0.48-3 on staging #3006

Merged
merged 4 commits into from
May 19, 2021
Merged

Update version to 1.0.48-3 on staging #3006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d84464
Fix a ButtonWithLoader usage
marcaaron May 19, 2021
21c7f92
Merge pull request #3004 from Expensify/marcaaron-fixButtonWithLoader
jasperhuangg May 19, 2021
ddfa4b0
Update version to 1.0.48-3
May 19, 2021
fbdfcd4
Merge pull request #3005 from Expensify/version-BUILD-21c7f922d6e9bf3…
OSBotify May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001004802
versionName "1.0.48-2"
versionCode 1001004803
versionName "1.0.48-3"
}
splits {
abi {
Expand Down
2 changes: 1 addition & 1 deletion ios/ExpensifyCash/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.0.48.2</string>
<string>1.0.48.3</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/ExpensifyCashTests/Info.plist
View file
Open in desktop
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.0.48.2</string>
<string>1.0.48.3</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
"version": "1.0.48-2",
"version": "1.0.48-3",
"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.",
Expand Down
7 changes: 4 additions & 3 deletions src/pages/iou/IOUDetailsModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import ONYXKEYS from '../../ONYXKEYS';
import themeColors from '../../styles/themes/default';
import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
import Navigation from '../../libs/Navigation/Navigation';
import ButtonWithLoader from '../../components/ButtonWithLoader';
import Button from '../../components/Button';
import ScreenWrapper from '../../components/ScreenWrapper';
import {payIOUReport} from '../../libs/actions/IOU';
import {fetchIOUReportByID} from '../../libs/actions/Report';
Expand Down Expand Up @@ -123,10 +123,11 @@ class IOUDetailsModal extends Component {
{(this.props.iouReport.hasOutstandingIOU
&& this.props.iouReport.managerEmail === sessionEmail && (
<View style={styles.p5}>
<ButtonWithLoader
<Button
success
text={this.props.translate('iou.settleElsewhere')}
isLoading={this.props.iou.loading}
onClick={this.performIOUPayment}
onPress={this.performIOUPayment}
/>
</View>
))}
Expand Down