diff --git a/src/app/AppRegistry.tsx b/src/app/AppRegistry.tsx index f8c21e04dc4..c8db8c55c83 100644 --- a/src/app/AppRegistry.tsx +++ b/src/app/AppRegistry.tsx @@ -461,7 +461,6 @@ export const modules = defineModules({ hidesBackButton: true, }), ConsignmentInquiry: reactModule(ConsignmentInquiryScreen, { - alwaysPresentModally: true, screenOptions: { gestureEnabled: false, }, diff --git a/src/app/Navigation/AuthenticatedRoutes/SharedRoutes.tsx b/src/app/Navigation/AuthenticatedRoutes/SharedRoutes.tsx index ef0d8a83f42..52455bd97d6 100644 --- a/src/app/Navigation/AuthenticatedRoutes/SharedRoutes.tsx +++ b/src/app/Navigation/AuthenticatedRoutes/SharedRoutes.tsx @@ -63,7 +63,7 @@ export const SharedRoutes = (): JSX.Element => { // when no header is visible, we want to make sure we are bound by the insets isHeaderShown(module) - const hidesBottomTabs = module.options.hidesBottomTabs + const hidesBottomTabs = module.options.hidesBottomTabs || isModalScreen(module) return ( diff --git a/src/app/Scenes/Artwork/Components/CommercialButtons/InquirySuccessNotification.tsx b/src/app/Scenes/Artwork/Components/CommercialButtons/InquirySuccessNotification.tsx index 063fba3267b..bf4b82cf176 100644 --- a/src/app/Scenes/Artwork/Components/CommercialButtons/InquirySuccessNotification.tsx +++ b/src/app/Scenes/Artwork/Components/CommercialButtons/InquirySuccessNotification.tsx @@ -1,6 +1,6 @@ import { Flex, Text } from "@artsy/palette-mobile" import { themeGet } from "@styled-system/theme-get" -import { navigate } from "app/system/navigation/navigate" +import { switchTab } from "app/system/navigation/navigate" import { useArtworkInquiryContext } from "app/utils/ArtworkInquiry/ArtworkInquiryStore" import { useScreenDimensions } from "app/utils/hooks" import React, { useEffect } from "react" @@ -28,7 +28,7 @@ export const InquirySuccessNotification: React.FC = () => { const navigateToConversation = () => { dispatch({ type: "setSuccessNotificationVisible", payload: false }) - navigate("inbox") + switchTab("inbox") } const handleRequestClose = () => { diff --git a/src/app/Scenes/Inbox/Components/Conversations/OfferSubmittedModal.tsx b/src/app/Scenes/Inbox/Components/Conversations/OfferSubmittedModal.tsx index f2e03449613..2ec9624b912 100644 --- a/src/app/Scenes/Inbox/Components/Conversations/OfferSubmittedModal.tsx +++ b/src/app/Scenes/Inbox/Components/Conversations/OfferSubmittedModal.tsx @@ -1,8 +1,8 @@ -import { Box, Text, Button } from "@artsy/palette-mobile" +import { Box, Button, Text } from "@artsy/palette-mobile" import { NavigationContainer } from "@react-navigation/native" import { FancyModal } from "app/Components/FancyModal/FancyModal" import { FancyModalHeader } from "app/Components/FancyModal/FancyModalHeader" -import { goBack, navigate } from "app/system/navigation/navigate" +import { goBack, switchTab } from "app/system/navigation/navigate" import { useSetWebViewCallback } from "app/utils/useWebViewEvent" import React, { useState } from "react" @@ -20,7 +20,7 @@ export const OfferSubmittedModal: React.FC = (props) => { ) const onGoToInbox = () => { - navigate("inbox") + switchTab("inbox") setVisible(false) }