From c559c5cfa2d95149bceb8c47fe5b135f3ac00589 Mon Sep 17 00:00:00 2001 From: Thiago Brezinski Date: Fri, 6 Oct 2023 09:24:31 +0100 Subject: [PATCH] feat(workspace-settings): currency page offline view --- .../WorkspaceSettingsCurrencyPage.js | 44 ++++++++++++------- src/pages/workspace/WorkspaceSettingsPage.js | 2 +- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/src/pages/workspace/WorkspaceSettingsCurrencyPage.js b/src/pages/workspace/WorkspaceSettingsCurrencyPage.js index b8d3b4404eae..9c757b730cef 100644 --- a/src/pages/workspace/WorkspaceSettingsCurrencyPage.js +++ b/src/pages/workspace/WorkspaceSettingsCurrencyPage.js @@ -12,6 +12,8 @@ import compose from '../../libs/compose'; import ONYXKEYS from '../../ONYXKEYS'; import withPolicy, {policyDefaultProps, policyPropTypes} from './withPolicy'; import * as Policy from '../../libs/actions/Policy'; +import * as PolicyUtils from '../../libs/PolicyUtils'; +import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView'; const propTypes = { /** Constant, list of available currencies */ @@ -71,26 +73,36 @@ function WorkspaceSettingsCurrencyPage({currencyList, policy}) { }; return ( - - - - + + Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} + shouldShow={_.isEmpty(policy) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy)} + subtitleKey={_.isEmpty(policy) ? undefined : 'workspace.common.notAuthorized'} + > + + + + ); } +WorkspaceSettingsCurrencyPage.displayName = 'WorkspaceSettingsCurrencyPage'; WorkspaceSettingsCurrencyPage.propTypes = propTypes; WorkspaceSettingsCurrencyPage.defaultProps = defaultProps; diff --git a/src/pages/workspace/WorkspaceSettingsPage.js b/src/pages/workspace/WorkspaceSettingsPage.js index 2de7ffdde1e5..fd975ebc9247 100644 --- a/src/pages/workspace/WorkspaceSettingsPage.js +++ b/src/pages/workspace/WorkspaceSettingsPage.js @@ -57,7 +57,7 @@ const defaultProps = { function WorkspaceSettingsPage({policy, currencyList, windowWidth, route}) { const {translate} = useLocalize(); - const formattedCurrency = policy && !_.isEmpty(currencyList) ? `${policy.outputCurrency} - ${currencyList[policy.outputCurrency].symbol}` : ''; + const formattedCurrency = !_.isEmpty(policy) && !_.isEmpty(currencyList) ? `${policy.outputCurrency} - ${currencyList[policy.outputCurrency].symbol}` : ''; const submit = useCallback( (values) => {