🍒 Cherry pick PR #5439 to staging 🍒

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001010104
-        versionName "1.1.1-4"
+        versionCode 1001010105
+        versionName "1.1.1-5"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.1.4</string>
+	<string>1.1.1.5</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.1.1.4</string>
+	<string>1.1.1.5</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.1-4",
+  "version": "1.1.1-5",
   "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/WorkspaceSidebar.js

@@ -23,12 +23,11 @@ import themedefault from '../../styles/themes/default';
 import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions';
 import compose from '../../libs/compose';
-import Growl from '../../libs/Growl';
 import ONYXKEYS from '../../ONYXKEYS';
 import Avatar from '../../components/Avatar';
-import CONST from '../../CONST';
 import Tooltip from '../../components/Tooltip';
 import variables from '../../styles/variables';
+import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator';
 
 const propTypes = {
     /** Whether the current screen is focused. */
@@ -43,24 +42,21 @@ const propTypes = {
         name: PropTypes.string,
     }),
 
-    /** All the polices that we have loaded in Onyx */
-    allPolicies: PropTypes.shape({
-        /** ID of the policy */
-        id: PropTypes.string,
-    }),
-
     ...withLocalizePropTypes,
     ...windowDimensionsPropTypes,
 };
 
 const defaultProps = {
     policy: {},
-    allPolicies: null,
 };
 
 const WorkspaceSidebar = ({
-    translate, isSmallScreenWidth, policy, allPolicies, isFocused,
+    translate, isSmallScreenWidth, policy, isFocused,
 }) => {
+    if (_.isEmpty(policy)) {
+        return <FullScreenLoadingIndicator />;
+    }
+
     const menuItems = [
         {
             translationKey: 'workspace.common.card',
@@ -80,16 +76,6 @@ const WorkspaceSidebar = ({
         },
     ];
 
-    // After all the policies have loaded, we can know if the given policyID points to a nonexistant workspace
-    // When free plan is out of beta and Permissions.canUseFreePlan() gets removed,
-    // all code involving 'allPolicies' can be removed since policy loading will no longer be delayed on login.
-    if (allPolicies !== null && _.isEmpty(policy)) {
-        Growl.error(translate('workspace.error.growlMessageInvalidPolicy'), CONST.GROWL.DURATION_LONG);
-        Navigation.dismissModal();
-        return null;
-    }
-
-
     const openEditor = () => Navigation.navigate(ROUTES.getWorkspaceEditorRoute(policy.id));
 
     return (
@@ -204,8 +190,5 @@ export default compose(
                 return `${ONYXKEYS.COLLECTION.POLICY}${policyID}`;
             },
         },
-        allPolicies: {
-            key: ONYXKEYS.COLLECTION.POLICY,
-        },
     }),
 )(WorkspaceSidebar);