From 8c2ec626a7e278062554e5c20cab6f8a7edd9785 Mon Sep 17 00:00:00 2001 From: c3024 Date: Fri, 22 Sep 2023 10:51:10 +0530 Subject: [PATCH 1/2] remove duplicate back icon, add clear message --- src/pages/workspace/WorkspaceNewRoomPage.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js index 89a3e854578d..c031fa8e6073 100644 --- a/src/pages/workspace/WorkspaceNewRoomPage.js +++ b/src/pages/workspace/WorkspaceNewRoomPage.js @@ -5,7 +5,9 @@ import {withOnyx} from 'react-native-onyx'; import PropTypes from 'prop-types'; import withNavigationFocus, {withNavigationFocusPropTypes} from '../../components/withNavigationFocus'; import * as Report from '../../libs/actions/Report'; +import * as App from '../../libs/actions/App'; import useLocalize from '../../hooks/useLocalize'; +import useWindowDimensions from '../../hooks/useWindowDimensions'; import styles from '../../styles/styles'; import RoomNameInput from '../../components/RoomNameInput'; import Picker from '../../components/Picker'; @@ -69,6 +71,7 @@ const defaultProps = { function WorkspaceNewRoomPage(props) { const {translate} = useLocalize(); + const {isSmallScreenWidth} = useWindowDimensions(); const [visibility, setVisibility] = useState(CONST.REPORT.VISIBILITY.RESTRICTED); const [policyID, setPolicyID] = useState(null); const visibilityDescription = useMemo(() => translate(`newRoomPage.${visibility}Description`), [translate, visibility]); @@ -144,7 +147,12 @@ function WorkspaceNewRoomPage(props) { ); return ( - + App.createWorkspaceAndNavigateToIt('', false, '', false, !isSmallScreenWidth)} + > Date: Sat, 23 Sep 2023 15:42:50 +0530 Subject: [PATCH 2/2] linkkey --- src/pages/workspace/WorkspaceNewRoomPage.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js index c031fa8e6073..e6c2d09f6069 100644 --- a/src/pages/workspace/WorkspaceNewRoomPage.js +++ b/src/pages/workspace/WorkspaceNewRoomPage.js @@ -7,7 +7,6 @@ import withNavigationFocus, {withNavigationFocusPropTypes} from '../../component import * as Report from '../../libs/actions/Report'; import * as App from '../../libs/actions/App'; import useLocalize from '../../hooks/useLocalize'; -import useWindowDimensions from '../../hooks/useWindowDimensions'; import styles from '../../styles/styles'; import RoomNameInput from '../../components/RoomNameInput'; import Picker from '../../components/Picker'; @@ -71,7 +70,6 @@ const defaultProps = { function WorkspaceNewRoomPage(props) { const {translate} = useLocalize(); - const {isSmallScreenWidth} = useWindowDimensions(); const [visibility, setVisibility] = useState(CONST.REPORT.VISIBILITY.RESTRICTED); const [policyID, setPolicyID] = useState(null); const visibilityDescription = useMemo(() => translate(`newRoomPage.${visibility}Description`), [translate, visibility]); @@ -151,7 +149,7 @@ function WorkspaceNewRoomPage(props) { shouldShow={!Permissions.canUsePolicyRooms(props.betas) || !workspaceOptions.length} shouldShowBackButton={false} linkKey="workspace.emptyWorkspace.title" - onLinkPress={() => App.createWorkspaceAndNavigateToIt('', false, '', false, !isSmallScreenWidth)} + onLinkPress={() => App.createWorkspaceAndNavigateToIt('', false, '', false, false)} >