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

…5360

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001009903
-        versionName "1.0.99-3"
+        versionCode 1001009904
+        versionName "1.0.99-4"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.99.3</string>
+	<string>1.0.99.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.0.99.3</string>
+	<string>1.0.99.4</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.0.99-3",
+  "version": "1.0.99-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/pages/home/sidebar/SidebarScreen.js

@@ -2,7 +2,6 @@ import React, {Component} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
-import _ from 'underscore';
 import styles from '../../../styles/styles';
 import SidebarLinks from './SidebarLinks';
 import PopoverMenu from '../../../components/PopoverMenu';
@@ -29,32 +28,17 @@ import Performance from '../../../libs/Performance';
 import NameValuePair from '../../../libs/actions/NameValuePair';
 
 const propTypes = {
-    /* Onyx Props */
-
-    /** Beta features list */
+    /* Beta features list */
     betas: PropTypes.arrayOf(PropTypes.string).isRequired,
 
-    /** Flag for new users used to open the Global Create menu on first load */
+    /* Flag for new users used to open the Global Create menu on first load */
     isFirstTimeNewExpensifyUser: PropTypes.bool.isRequired,
 
-    /** The list of this user's policies */
-    policies: PropTypes.objectOf(PropTypes.shape({
-        /** The type of the policy */
-        type: PropTypes.string,
-
-        /** The user's role in the policy */
-        role: PropTypes.string,
-    })),
-
     ...windowDimensionsPropTypes,
 
     ...withLocalizePropTypes,
 };
 
-const defaultProps = {
-    policies: {},
-};
-
 class SidebarScreen extends Component {
     constructor(props) {
         super(props);
@@ -74,21 +58,13 @@ class SidebarScreen extends Component {
         Timing.start(CONST.TIMING.SIDEBAR_LOADED, true);
 
         if (this.props.isFirstTimeNewExpensifyUser) {
-            const hasFreePolicy = _.chain(this.props.policies)
-                .some(policy => policy && policy.type === CONST.POLICY.TYPE.FREE && policy.role === CONST.POLICY.ROLE.ADMIN)
-                .value();
-
-            // If user doesn't have any free policies (workspaces) set up, automatically open create menu
-            if (!hasFreePolicy) {
-                // For some reason, the menu doesn't open without the timeout
-                setTimeout(() => {
-                    this.toggleCreateMenu();
-                }, 200);
-            }
-
-            // Set the NVP to false so we don't automatically open the menu again
-            // Note: this may need to be moved if this NVP is used for anything else later
-            NameValuePair.set(CONST.NVP.IS_FIRST_TIME_NEW_EXPENSIFY_USER, false, ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER);
+            // For some reason, the menu doesn't open without the timeout
+            setTimeout(() => {
+                this.toggleCreateMenu();
+
+                // Set the NVP back to false (this may need to be moved if this NVP is used for anything else later)
+                NameValuePair.set(CONST.NVP.IS_FIRST_TIME_NEW_EXPENSIFY_USER, false, ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER);
+            }, 200);
         }
     }
 
@@ -201,7 +177,6 @@ class SidebarScreen extends Component {
 }
 
 SidebarScreen.propTypes = propTypes;
-SidebarScreen.defaultProps = defaultProps;
 export default compose(
     withLocalize,
     withWindowDimensions,
@@ -212,8 +187,5 @@ export default compose(
         isFirstTimeNewExpensifyUser: {
             key: ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER,
         },
-        policies: {
-            key: ONYXKEYS.COLLECTION.POLICY,
-        },
     }),
 )(SidebarScreen);