Add Rest of UI for Workspace Chats #7957
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -210,11 +210,7 @@ function hasReportDraftComment(report) { | |
| * @returns {Array<String>} | ||
| */ | ||
| function getParticipants(report) { | ||
| return [...lodashGet(report, ['participants'], [])]; | ||
|
There was a problem hiding this comment. OK, now that we are not pushing anything into the participants the spread is not necessary? Probably this whole method can go and the one usage can be updated App/src/libs/OptionsListUtils.js Line 436 in 47b4541 There was a problem hiding this comment. Oh yeah this is a good point, now I'm not sure why the spread was there in the first place 😅 |
||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ import lodashGet from 'lodash/get'; | |
| import Onyx from 'react-native-onyx'; | ||
| import ONYXKEYS from '../ONYXKEYS'; | ||
| import CONST from '../CONST'; | ||
| import * as Localize from './Localize'; | ||
|
|
||
| let sessionEmail; | ||
| Onyx.connect({ | ||
|
|
@@ -170,6 +171,9 @@ function getChatRoomSubtitle(report, policiesMap) { | |
| if (isArchivedRoom(report)) { | ||
| return report.oldPolicyName; | ||
| } | ||
| if (isPolicyExpenseChat(report) && report.isOwnPolicyExpenseChat) { | ||
| return Localize.translateLocal('workspace.common.workspace'); | ||
| } | ||
| return lodashGet( | ||
| policiesMap, | ||
| [`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`, 'name'], | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -80,7 +80,7 @@ class ReportDetailsPage extends Component { | |
| action: () => { Navigation.navigate(ROUTES.getReportParticipantsRoute(props.report.reportID)); }, | ||
| }); | ||
|
|
||
| // Chat rooms will allow you to do more things than typical chats so they have extra options | ||
TomatoToaster marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (ReportUtils.isChatRoom(this.props.report)) { | ||
| this.menuItems = this.menuItems.concat([ | ||
| { | ||
|
|
@@ -100,6 +100,17 @@ class ReportDetailsPage extends Component { | |
| }, | ||
| ]); | ||
| } | ||
|
|
||
| // Policy Expense Chats will also allow the user to see settings[] | ||
| if (ReportUtils.isPolicyExpenseChat(this.props.report)) { | ||
TomatoToaster marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| this.menuItems = this.menuItems.concat([ | ||
TomatoToaster marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| translationKey: 'common.settings', | ||
| icon: Expensicons.Gear, | ||
| action: () => { Navigation.navigate(ROUTES.getReportSettingsRoute(props.report.reportID)); }, | ||
| }, | ||
TomatoToaster marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ]); | ||
| } | ||
| } | ||
|
|
||
| render() { | ||
|
|
@@ -146,7 +157,7 @@ class ReportDetailsPage extends Component { | |
| tooltipEnabled | ||
| numberOfLines={1} | ||
| textStyles={[styles.headerText, styles.mb2, styles.textAlignCenter]} | ||
| shouldUseFullTitle={isChatRoom || isPolicyExpenseChat} | ||
| /> | ||
| </View> | ||
| <Text | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -80,10 +80,10 @@ const ReportParticipantsPage = (props) => { | |
| return ( | ||
| <ScreenWrapper> | ||
| <HeaderWithCloseButton | ||
| title={props.translate((ReportUtils.isChatRoom(props.report) || ReportUtils.isPolicyExpenseChat(props.report)) ? 'common.members' : 'common.details')} | ||
| onCloseButtonPress={Navigation.dismissModal} | ||
| onBackButtonPress={Navigation.goBack} | ||
| shouldShowBackButton={ReportUtils.isChatRoom(props.report) || ReportUtils.isPolicyExpenseChat(props.report)} | ||
| /> | ||
| <View | ||
| pointerEvents="box-none" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -152,7 +152,9 @@ class ReportSettingsPage extends Component { | |
| } | ||
|
|
||
| render() { | ||
| const shouldShowRename = !ReportUtils.isPolicyExpenseChat(this.props.report); | ||
| const shouldDisableRename = ReportUtils.isDefaultRoom(this.props.report) | ||
| || ReportUtils.isArchivedRoom(this.props.report); | ||
| const linkedWorkspace = _.find(this.props.policies, policy => policy.id === this.props.report.policyID); | ||
|
|
||
| return ( | ||
|
|
@@ -184,33 +186,35 @@ class ReportSettingsPage extends Component { | |
| /> | ||
| </View> | ||
| </View> | ||
| {shouldShowRename && ( | ||
| <View style={styles.mt4}> | ||
| <Text style={[styles.formLabel]} numberOfLines={1}> | ||
| {this.props.translate('newRoomPage.roomName')} | ||
| </Text> | ||
| <View style={[styles.flexRow, styles.mb1]}> | ||
| <View style={[styles.flex3]}> | ||
| <RoomNameInput | ||
| initialValue={this.state.newRoomName} | ||
| policyID={linkedWorkspace && linkedWorkspace.id} | ||
| errorText={this.state.errors.newRoomName} | ||
| onChangeText={newRoomName => this.clearErrorAndSetValue('newRoomName', newRoomName)} | ||
| disabled={shouldDisableRename} | ||
| /> | ||
| </View> | ||
| <Button | ||
| large | ||
| success={!shouldDisableRename} | ||
| text={this.props.translate('common.save')} | ||
| onPress={this.validateAndRenameReport} | ||
| style={[styles.ml2, styles.flex1]} | ||
| textStyles={[styles.label]} | ||
| innerStyles={[styles.ph5]} | ||
| isLoading={this.props.isLoadingRenamePolicyRoom} | ||
| isDisabled={shouldDisableRename} | ||
| /> | ||
| </View> | ||
| </View> | ||
| )} | ||
| {linkedWorkspace && ( | ||
| <View style={[styles.mt4]}> | ||
| <Text style={[styles.formLabel]} numberOfLines={1}> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -126,7 +126,7 @@ const HeaderView = (props) => { | |
| > | ||
| <Pressable | ||
| onPress={() => { | ||
| if (isChatRoom || isPolicyExpenseChat) { | ||
| return Navigation.navigate(ROUTES.getReportDetailsRoute(props.report.reportID)); | ||
| } | ||
| if (participants.length === 1) { | ||
|
|
@@ -158,7 +158,7 @@ const HeaderView = (props) => { | |
| textStyles={[styles.headerText, styles.textNoWrap]} | ||
| shouldUseFullTitle={isChatRoom || isPolicyExpenseChat} | ||
| /> | ||
| {(isChatRoom || isPolicyExpenseChat) && ( | ||
| <Text | ||
| style={[ | ||
| styles.sidebarLinkText, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice one, that comment didn't really match the prop name.