Merge pull request #12985 from Expensify/update-staging-from-main

Update version to 1.2.31-2 on staging
Expensify · Nov 24, 2022 · 2661891 · 2661891
2 parents 87df100 + dcb8c3a
commit 2661891
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 13 deletions.
diff --git 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 1001023101
-        versionName "1.2.31-1"
+        versionCode 1001023102
+        versionName "1.2.31-2"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.31.1</string>
+	<string>1.2.31.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.31.1</string>
+	<string>1.2.31.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.31-1",
+  "version": "1.2.31-2",
   "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/Policy.js b/src/libs/actions/Policy.js
@@ -752,7 +752,12 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
         {
             onyxMethod: CONST.ONYX.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
-            value: announceChatData,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                ...announceChatData,
+            },
         },
         {
             onyxMethod: CONST.ONYX.METHOD.SET,
@@ -762,7 +767,12 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
         {
             onyxMethod: CONST.ONYX.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
-            value: adminsChatData,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                ...adminsChatData,
+            },
         },
         {
             onyxMethod: CONST.ONYX.METHOD.SET,
@@ -772,7 +782,12 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
         {
             onyxMethod: CONST.ONYX.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
-            value: expenseChatData,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                ...expenseChatData,
+            },
         },
         {
             onyxMethod: CONST.ONYX.METHOD.SET,
@@ -787,7 +802,12 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
         {
             onyxMethod: CONST.ONYX.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
-            value: {pendingAction: null},
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+                pendingAction: null,
+            },
         },
         {
             onyxMethod: CONST.ONYX.METHOD.MERGE,
@@ -801,7 +821,12 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
         {
             onyxMethod: CONST.ONYX.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
-            value: {pendingAction: null},
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+                pendingAction: null,
+            },
         },
         {
             onyxMethod: CONST.ONYX.METHOD.MERGE,
@@ -815,7 +840,12 @@ function createWorkspace(ownerEmail = '', makeMeAdmin = false, policyName = '',
         {
             onyxMethod: CONST.ONYX.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
-            value: {pendingAction: null},
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+                pendingAction: null,
+            },
         },
         {
             onyxMethod: CONST.ONYX.METHOD.MERGE,