views,
);
- const { getIcon } = useIcons();
- const currentPath = useLocation().pathname;
- const { getLastVisitedViewIdFromObjectMetadataItemId } = useLastVisitedView();
+ const mainContextStoreComponentInstanceId = useRecoilValue(
+ mainContextStoreComponentInstanceIdState,
+ );
- const lastVisitedViewId = getLastVisitedViewIdFromObjectMetadataItemId(
- objectMetadataItem.id,
+ const contextStoreCurrentViewId = useRecoilComponentValueV2(
+ contextStoreCurrentViewIdComponentState,
+ mainContextStoreComponentInstanceId,
);
- const viewId = lastVisitedViewId ?? objectMetadataViews[0]?.id;
+ const lastVisitedViewPerObjectMetadataItem = useRecoilValue(
+ lastVisitedViewPerObjectMetadataItemState,
+ );
+
+ const lastVisitedViewId =
+ lastVisitedViewPerObjectMetadataItem?.[objectMetadataItem.id];
+
+ const { getIcon } = useIcons();
+ const currentPath = useLocation().pathname;
const navigationPath = getAppPath(
AppPath.RecordIndexPage,
{ objectNamePlural: objectMetadataItem.namePlural },
- viewId ? { viewId } : undefined,
+ lastVisitedViewId ? { viewId: lastVisitedViewId } : undefined,
);