Skip to content

Commit

Permalink
Merge pull request #3118 from Expensify/main
Browse files Browse the repository at this point in the history
  • Loading branch information
OSBotify authored May 25, 2021
2 parents 18718ef + 51392f5 commit f311fc1
Show file tree
Hide file tree
Showing 6 changed files with 23 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 @@ -148,8 +148,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001005202
versionName "1.0.52-2"
versionCode 1001005203
versionName "1.0.52-3"
}
splits {
abi {
Expand Down
2 changes: 1 addition & 1 deletion ios/ExpensifyCash/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.0.52.2</string>
<string>1.0.52.3</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/ExpensifyCashTests/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.0.52.2</string>
<string>1.0.52.3</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": "expensify.cash",
"version": "1.0.52-2",
"version": "1.0.52-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
18 changes: 17 additions & 1 deletion src/components/IOUBadge.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,31 @@ const propTypes = {
iouReport: PropTypes.shape({
/** The total amount in cents */
total: PropTypes.number,

/** The owner of the IOUReport */
ownerEmail: PropTypes.string,
}),

/** Session of currently logged in user */
session: PropTypes.shape({
email: PropTypes.string.isRequired,
}).isRequired,
};

const defaultProps = {
iouReport: {
total: 0,
ownerEmail: null,
},
};

const IOUBadge = props => (
<View
style={[styles.badge, styles.badgeSuccess, styles.ml2]}
style={[
styles.badge,
styles.ml2,
props.session.email === props.iouReport.ownerEmail ? styles.badgeSuccess : styles.badgeDanger,
]}
>
<Text
style={styles.badgeText}
Expand All @@ -40,4 +53,7 @@ export default withOnyx({
iouReport: {
key: ({iouReportID}) => `${ONYXKEYS.COLLECTION.REPORT_IOUS}${iouReportID}`,
},
session: {
key: ONYXKEYS.SESSION,
},
})(IOUBadge);

0 comments on commit f311fc1

Please sign in to comment.