diff --git a/android/app/build.gradle b/android/app/build.gradle index 2df3410daba2..45a5f5358b78 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -106,8 +106,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001032900 - versionName "1.3.29-0" + versionCode 1001032901 + versionName "1.3.29-1" } splits { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index a6f1f6608f8a..21a0fad0e70b 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1.3.29.0 + 1.3.29.1 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 9d2f19c6c507..f29f4e50c61f 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.3.29.0 + 1.3.29.1 diff --git a/package-lock.json b/package-lock.json index 40229259938e..76cee28bb14d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.3.29-0", + "version": "1.3.29-1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.3.29-0", + "version": "1.3.29-1", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index eb61362d1597..99d4c914dc65 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.3.29-0", + "version": "1.3.29-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.", diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js index 4e90c16c0077..8f67cc0c35dc 100644 --- a/src/pages/workspace/WorkspaceMembersPage.js +++ b/src/pages/workspace/WorkspaceMembersPage.js @@ -36,6 +36,7 @@ import withCurrentUserPersonalDetails from '../../components/withCurrentUserPers import * as PolicyUtils from '../../libs/PolicyUtils'; import PressableWithFeedback from '../../components/Pressable/PressableWithFeedback'; import Log from '../../libs/Log'; +import * as PersonalDetailsUtils from '../../libs/PersonalDetailsUtils'; const propTypes = { /** The personal details of the person who is logged in */ @@ -286,8 +287,9 @@ class WorkspaceMembersPage extends React.Component { validate() { const errors = {}; + const ownerAccountID = _.first(PersonalDetailsUtils.getAccountIDsByLogins([this.props.policy.owner])); _.each(this.state.selectedEmployees, (member) => { - if (member !== this.props.policy.owner && member !== this.props.session.email) { + if (member !== ownerAccountID && member !== this.props.session.accountID) { return; } @@ -319,7 +321,7 @@ class WorkspaceMembersPage extends React.Component { * @returns {React.Component} */ renderItem({item}) { - const hasError = !_.isEmpty(item.errors) || this.state.errors[item.login]; + const hasError = !_.isEmpty(item.errors) || this.state.errors[item.accountID]; const isChecked = _.contains(this.state.selectedEmployees, Number(item.accountID)); return ( this.toggleUser(item.accountID, item.pendingAction)} accessibilityRole="checkbox" accessibilityState={{ @@ -368,10 +370,10 @@ class WorkspaceMembersPage extends React.Component { )} - {!_.isEmpty(this.state.errors[item.login]) && ( + {!_.isEmpty(this.state.errors[item.accountID]) && ( )}