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

…-11774

🍒 Cherry pick PR #11774 to staging 🍒

android/app/build.gradle

@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001021303
-        versionName "1.2.13-3"
+        versionCode 1001021304
+        versionName "1.2.13-4"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.13.3</string>
+	<string>1.2.13.4</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.2.13.3</string>
+	<string>1.2.13.4</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.13-3",
+  "version": "1.2.13-4",
   "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/libs/actions/App.js

@@ -188,11 +188,16 @@ function setUpPoliciesAndNavigate(session) {
     const url = new URL(currentUrl);
     const exitTo = url.searchParams.get('exitTo');
 
+    // Approved Accountants and Guides can enter a flow where they make a workspace for other users,
+    // and those are passed as a search parameter when using transition links
+    const ownerEmail = url.searchParams.get('ownerEmail');
+    const makeMeAdmin = url.searchParams.get('makeMeAdmin');
+
     const shouldCreateFreePolicy = !isLoggingInAsNewUser
                         && Str.startsWith(url.pathname, Str.normalizeUrl(ROUTES.TRANSITION_FROM_OLD_DOT))
                         && exitTo === ROUTES.WORKSPACE_NEW;
     if (shouldCreateFreePolicy) {
-        Policy.createWorkspace();
+        Policy.createWorkspace(ownerEmail, makeMeAdmin);
         return;
     }
     if (!isLoggingInAsNewUser && exitTo) {

src/libs/actions/Policy.js

@@ -764,8 +764,11 @@ function generatePolicyID() {
 
 /**
  * Optimistically creates a new workspace and default workspace chats
+ *
+ * @param {String} [ownerEmail] Optional, the email of the account to make the owner of the policy
+ * @param {Boolean} [makeMeAdmin] Optional, leave the calling account as an admin on the policy
  */
-function createWorkspace() {
+function createWorkspace(ownerEmail = '', makeMeAdmin = false) {
     const policyID = generatePolicyID();
     const workspaceName = generateDefaultWorkspaceName();
 
@@ -786,6 +789,8 @@ function createWorkspace() {
         announceChatReportID,
         adminsChatReportID,
         expenseChatReportID,
+        ownerEmail,
+        makeMeAdmin,
         policyName: workspaceName,
         type: CONST.POLICY.TYPE.FREE,
     },

src/pages/workspace/WorkspaceMembersPage.js

@@ -267,7 +267,7 @@ class WorkspaceMembersPage extends React.Component {
                                 }}
                             />
                         </View>
-                        {this.props.session.email === item.login && (
+                        {(this.props.session.email === item.login || item.role === 'admin') && (
                             <View style={styles.peopleRowCell}>
                                 <View style={[styles.badge, styles.peopleBadge]}>
                                     <Text style={[styles.peopleBadgeText]}>