diff --git a/src/screens/Form/components/EntityPage/components/common/EntityPanel/Navigation/component.js b/src/screens/Form/components/EntityPage/components/common/EntityPanel/Navigation/component.js index dcfb9283..5ef9c98a 100644 --- a/src/screens/Form/components/EntityPage/components/common/EntityPanel/Navigation/component.js +++ b/src/screens/Form/components/EntityPage/components/common/EntityPanel/Navigation/component.js @@ -4,6 +4,7 @@ import {View, StyleSheet} from 'react-native'; import {isTablet} from 'react-native-device-info'; import {useDispatch, useSelector} from 'react-redux'; +import {useIsTable} from 'screens/Form/components/EntityPage/components/common/EntityPanel/NewItemButton/component'; import {defaultCycle} from 'arena/config'; import Button from 'arena-mobile-ui/components/Button'; import Icon from 'arena-mobile-ui/components/Icon'; @@ -386,11 +387,19 @@ const Next = ({parent}) => { formSelectors.getParentEntityNodeDef, ); const isEntityShowAsTable = useSelector(formSelectors.isEntityShowAsTable); - + const isTable = useIsTable(); + const isMultiple = useMemo( + () => NodeDefs.isMultiple(currentEntityNodeDef), + [currentEntityNodeDef], + ); const showMultipleEntityHome = useSelector( formSelectors.showMultipleEntityHome, ); + if ((isTable || isMultiple) && !showMultipleEntityHome) { + return ; + } + if (nextNodeDef?.uuid) { return ; }