Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

W8/ideal nav fixes v4 #54

Merged
merged 2 commits into from
Jan 31, 2024
Merged

W8/ideal nav fixes v4 #54

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1424356
Fix showing not-found when the new workspace is created (215)
WojtekBoman Jan 31, 2024
496059e
Merge branch 'ideal-nav-merge' into w8/ideal-nav-fixes-v4
WojtekBoman Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/pages/workspace/WorkspacePageWithSections.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import type {RouteProp} from '@react-navigation/native';
import type {ReactNode} from 'react';
import React, {useEffect, useMemo, useRef} from 'react';
import {View} from 'react-native';
import {withOnyx} from 'react-native-onyx';
import type {OnyxEntry} from 'react-native-onyx';
import {withOnyx} from 'react-native-onyx';
import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
Expand Down Expand Up @@ -89,6 +89,7 @@ function WorkspacePageWithSections({
guidesCallTaskID = '',
headerText,
policy,
policyDraft,
reimbursementAccount = ReimbursementAccountProps.reimbursementAccountDefaultProps,
route,
shouldUseScrollView = false,
Expand Down Expand Up @@ -128,12 +129,13 @@ function WorkspacePageWithSections({
}, [shouldSkipVBBACall]);

const shouldShow = useMemo(() => {
if (isEmptyObject(policy)) {
if (isEmptyObject(policy) && isEmptyObject(policyDraft)) {
return true;
}

return (!PolicyUtils.isPolicyAdmin(policy) && !shouldShowNonAdmin) || PolicyUtils.isPendingDeletePolicy(policy);
}, [shouldShowNonAdmin, policy]);
return (!isEmptyObject(policy) && !PolicyUtils.isPolicyAdmin(policy) && !shouldShowNonAdmin) || PolicyUtils.isPendingDeletePolicy(policy);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [policy, shouldShowNonAdmin]);

return (
<ScreenWrapper
Expand Down
Loading