diff --git a/android/app/build.gradle b/android/app/build.gradle index 87ed66046974..08d39c658713 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -156,8 +156,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001023104 - versionName "1.2.31-4" + versionCode 1001023105 + versionName "1.2.31-5" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 92a55bb4d111..56324816d073 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.2.31.4 + 1.2.31.5 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 61ad9e016da6..52758a035e13 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.2.31.4 + 1.2.31.5 diff --git a/package-lock.json b/package-lock.json index b749a7fe2a0c..e491a4f97590 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.2.31-4", + "version": "1.2.31-5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.2.31-4", + "version": "1.2.31-5", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index b0c75a886b3c..f64f6bdf642a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.2.31-4", + "version": "1.2.31-5", "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/libs/actions/IOU.js b/src/libs/actions/IOU.js index 438236afdefa..9fb462f64b50 100644 --- a/src/libs/actions/IOU.js +++ b/src/libs/actions/IOU.js @@ -113,7 +113,7 @@ function requestMoney(report, amount, currency, recipientEmail, participant, com }, }, { - onyxMethod: CONST.ONYX.METHOD.MERGE, + onyxMethod: originalIOUStatus ? CONST.ONYX.METHOD.MERGE : CONST.ONYX.METHOD.SET, key: `${ONYXKEYS.COLLECTION.REPORT_IOUS}${iouReport.reportID}`, value: iouReport, }, diff --git a/src/pages/ReportSettingsPage.js b/src/pages/ReportSettingsPage.js index c59511daff67..c2c35e4c7c7b 100644 --- a/src/pages/ReportSettingsPage.js +++ b/src/pages/ReportSettingsPage.js @@ -102,6 +102,11 @@ class ReportSettingsPage extends Component { return false; } + // Show error if the room name already exists + if (ValidationUtils.isExistingRoomName(this.state.newRoomName, this.props.reports, this.props.report.policyID)) { + errors.newRoomName = this.props.translate('newRoomPage.roomAlreadyExistsError'); + } + // We error if the user doesn't enter a room name or left blank if (!this.state.newRoomName || this.state.newRoomName === CONST.POLICY.ROOM_PREFIX) { errors.newRoomName = this.props.translate('newRoomPage.pleaseEnterRoomName'); @@ -253,5 +258,8 @@ export default compose( policies: { key: ONYXKEYS.COLLECTION.POLICY, }, + reports: { + key: ONYXKEYS.COLLECTION.REPORT, + }, }), )(ReportSettingsPage);