diff --git a/android/app/build.gradle b/android/app/build.gradle index afdc2cd3abea..d116f4807808 100644 --- a/android/app/build.gradle +++ b/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 { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index d290a2e6f701..76b66a800551 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.1.4 + 1.1.1.5 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 2bf2db0a0f10..efba4d8dbe93 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.1.4 + 1.1.1.5 diff --git a/package-lock.json b/package-lock.json index 6289b6ba93ed..566ca2003ca4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.1-4", + "version": "1.1.1-5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7d526c6925ac..41a9dded143f 100644 --- a/package.json +++ b/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.", diff --git a/src/pages/workspace/WorkspaceSidebar.js b/src/pages/workspace/WorkspaceSidebar.js index ad5c99d86e88..869bdde41e1e 100644 --- a/src/pages/workspace/WorkspaceSidebar.js +++ b/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 ; + } + 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);