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

page not found when click new submit expense #45567

Merged
merged 9 commits into from
Jul 27, 2024
Merged

page not found when click new submit expense #45567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0c8b1de
page not found when click back reciept detail
nkdengineer Jul 17, 2024
45ee5a1
Merge branch 'main' into fix/44924
nkdengineer Jul 19, 2024
31445dc
Merge branch 'main' into fix/44924
nkdengineer Jul 19, 2024
9cf272d
Merge branch 'main' into fix/44924
nkdengineer Jul 22, 2024
a913d83
test perf
nkdengineer Jul 22, 2024
d65c34d
Merge branch 'main' into fix/44924
nkdengineer Jul 23, 2024
de325b1
run perf-test
nkdengineer Jul 23, 2024
2ab0c6f
reduce compare menuItems
nkdengineer Jul 23, 2024
3a51102
merge main
nkdengineer Jul 24, 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
2 changes: 1 addition & 1 deletion src/components/PopoverMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ PopoverMenu.displayName = 'PopoverMenu';
export default React.memo(
PopoverMenu,
(prevProps, nextProps) =>
!lodashIsEqual(prevProps.menuItems, nextProps.menuItems) &&
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@roryabraham In the past we didn't re-render if the menuItems is changed so I think it's fine if we only compare the length of menuItems here.

Or If we agree with more re-rendering, I will add the previous change back.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the past we didn't re-render if the menuItems is changed

What makes you say that? It looks like it was using a deep equality comparison in the React.memo?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@roryabraham Because we used !lodashIsEqual(prevProps.menuItems, nextProps.menuItems) not lodashIsEqual(prevProps.menuItems, nextProps.menuItems)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pretty sure !lodashIsEqual was a bug before, since the 2nd arg to React.memo should return true if the props are equal

prevProps.menuItems.length === nextProps.menuItems.length &&
prevProps.isVisible === nextProps.isVisible &&
lodashIsEqual(prevProps.anchorPosition, nextProps.anchorPosition) &&
prevProps.anchorRef === nextProps.anchorRef &&
Expand Down
7 changes: 4 additions & 3 deletions src/pages/workspace/AccessOrNotFoundWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ type AccessOrNotFoundWrapperProps = AccessOrNotFoundWrapperOnyxProps & {
allPolicies?: OnyxCollection<OnyxTypes.Policy>;
} & Pick<FullPageNotFoundViewProps, 'subtitleKey' | 'onLinkPress'>;

type PageNotFoundFallbackProps = Pick<AccessOrNotFoundWrapperProps, 'policyID' | 'fullPageNotFoundViewProps'> & {shouldShowFullScreenFallback: boolean};
type PageNotFoundFallbackProps = Pick<AccessOrNotFoundWrapperProps, 'policyID' | 'fullPageNotFoundViewProps'> & {shouldShowFullScreenFallback: boolean; isMoneyRequest: boolean};

function PageNotFoundFallback({policyID, shouldShowFullScreenFallback, fullPageNotFoundViewProps}: PageNotFoundFallbackProps) {
function PageNotFoundFallback({policyID, shouldShowFullScreenFallback, fullPageNotFoundViewProps, isMoneyRequest}: PageNotFoundFallbackProps) {
return shouldShowFullScreenFallback ? (
<FullPageNotFoundView
shouldShow
Expand All @@ -97,7 +97,7 @@ function PageNotFoundFallback({policyID, shouldShowFullScreenFallback, fullPageN
/>
) : (
<NotFoundPage
onBackButtonPress={() => Navigation.goBack(policyID ? ROUTES.WORKSPACE_PROFILE.getRoute(policyID) : undefined)}
onBackButtonPress={() => Navigation.goBack(policyID && !isMoneyRequest ? ROUTES.WORKSPACE_PROFILE.getRoute(policyID) : undefined)}
// eslint-disable-next-line react/jsx-props-no-spreading
{...fullPageNotFoundViewProps}
/>
Expand Down Expand Up @@ -155,6 +155,7 @@ function AccessOrNotFoundWrapper({accessVariants = [], fullPageNotFoundViewProps
return (
<PageNotFoundFallback
policyID={policyID}
isMoneyRequest={isMoneyRequest}
shouldShowFullScreenFallback={!isFeatureEnabled || isPolicyNotAccessible}
fullPageNotFoundViewProps={fullPageNotFoundViewProps}
/>
Expand Down
Loading