Merge pull request #21028 from Expensify/OSBotify-cherry-pick-staging…

…-21023

🍒 Cherry pick PR #21023 to staging 🍒

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 {

ios/NewExpensify/Info.plist

@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.29.0</string>
+	<string>1.3.29.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.29.0</string>
+	<string>1.3.29.1</string>
 </dict>
 </plist>

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.",

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 (
             <OfflineWithFeedback
@@ -328,7 +330,7 @@ class WorkspaceMembersPage extends React.Component {
                 errors={item.errors}
             >
                 <PressableWithFeedback
-                    style={[styles.peopleRow, (_.isEmpty(item.errors) || this.state.errors[item.login]) && styles.peopleRowBorderBottom, hasError && styles.borderColorDanger]}
+                    style={[styles.peopleRow, (_.isEmpty(item.errors) || this.state.errors[item.accountID]) && styles.peopleRowBorderBottom, hasError && styles.borderColorDanger]}
                     onPress={() => this.toggleUser(item.accountID, item.pendingAction)}
                     accessibilityRole="checkbox"
                     accessibilityState={{
@@ -368,10 +370,10 @@ class WorkspaceMembersPage extends React.Component {
                         </View>
                     )}
                 </PressableWithFeedback>
-                {!_.isEmpty(this.state.errors[item.login]) && (
+                {!_.isEmpty(this.state.errors[item.accountID]) && (
                     <FormHelpMessage
                         isError
-                        message={this.state.errors[item.login]}
+                        message={this.state.errors[item.accountID]}
                     />
                 )}
             </OfflineWithFeedback>