From bc9e68e58132b138bb8921ef92c2b42c2d35d48d Mon Sep 17 00:00:00 2001 From: chiragsalian Date: Mon, 9 May 2022 18:03:58 -0700 Subject: [PATCH 1/2] Getting back 3 dots and assistance buttons --- src/pages/workspace/WorkspaceInitialPage.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js index 2681476364b0..3e43faf56c14 100644 --- a/src/pages/workspace/WorkspaceInitialPage.js +++ b/src/pages/workspace/WorkspaceInitialPage.js @@ -120,7 +120,21 @@ class WorkspaceInitialPage extends React.Component { shouldShowBackButton onBackButtonPress={() => Navigation.navigate(ROUTES.SETTINGS)} onCloseButtonPress={() => Navigation.dismissModal()} + shouldShowThreeDotsButton + shouldShowGetAssistanceButton guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_INITIAL} + threeDotsMenuItems={[ + { + icon: Expensicons.Plus, + text: this.props.translate('workspace.new.newWorkspace'), + onSelected: () => PolicyActions.createAndNavigate(), + }, { + icon: Expensicons.Trashcan, + text: this.props.translate('workspace.common.delete'), + onSelected: () => this.setState({isDeleteModalOpen: true}), + }, + ]} + threeDotsAnchorPosition={styles.threeDotsPopoverOffset} /> Date: Mon, 9 May 2022 18:04:27 -0700 Subject: [PATCH 2/2] trying different styles --- src/pages/workspace/WorkspaceInitialPage.js | 108 ++++++++++---------- 1 file changed, 53 insertions(+), 55 deletions(-) diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js index 3e43faf56c14..7a4d34a665b3 100644 --- a/src/pages/workspace/WorkspaceInitialPage.js +++ b/src/pages/workspace/WorkspaceInitialPage.js @@ -140,69 +140,67 @@ class WorkspaceInitialPage extends React.Component { contentContainerStyle={[ styles.flexGrow1, styles.flexColumn, - styles.justifyContentBetween, + styles.w100, ]} > - - - + + + + {this.props.policy.avatarURL + ? ( + + ) + : ( + + )} + + {!_.isEmpty(this.props.policy.name) && ( - {this.props.policy.avatarURL - ? ( - - ) - : ( - - )} + + + {this.props.policy.name} + + - {!_.isEmpty(this.props.policy.name) && ( - - - - {this.props.policy.name} - - - - )} - + )} - {_.map(menuItems, item => ( - item.action()} - shouldShowRightIcon - /> - ))} + {_.map(menuItems, item => ( + item.action()} + shouldShowRightIcon + /> + ))}