Skip to content

Fixed icon alignment on ReportComposeAction #4851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iwiznia merged 2 commits into from
Aug 26, 2021
Merged

Fixed icon alignment on ReportComposeAction #4851

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99a076f
fix(tooltip-icon-button): Fixed icon alignment on ReportComposeAction
mananjadhav Aug 26, 2021
b8a3a57
ix(tooltip-icon-button): Removed extra spacing
mananjadhav Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 29 additions & 25 deletions src/pages/home/report/ReportActionCompose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,19 +493,21 @@ class ReportActionCompose extends React.Component {
<AttachmentPicker>
{({openPicker}) => (
<>
<Tooltip text={this.props.translate('reportActionCompose.addAction')}>
<TouchableOpacity
onPress={(e) => {
e.preventDefault();
this.setMenuVisibility(true);
}}
style={styles.chatItemAttachButton}
underlayColor={themeColors.componentBG}
disabled={isBlockedFromConcierge || isArchivedChatRoom}
>
<Icon src={Plus} />
</TouchableOpacity>
</Tooltip>
<View style={[styles.justifyContentEnd]}>
<Tooltip text={this.props.translate('reportActionCompose.addAction')}>
<TouchableOpacity
onPress={(e) => {
e.preventDefault();
this.setMenuVisibility(true);
}}
style={styles.chatItemAttachButton}
underlayColor={themeColors.componentBG}
disabled={isBlockedFromConcierge || isArchivedChatRoom}
>
<Icon src={Plus} />
</TouchableOpacity>
</Tooltip>
</View>
<PopoverMenu
isVisible={this.state.isMenuVisible}
onClose={() => this.setMenuVisibility(false)}
Expand Down Expand Up @@ -645,18 +647,20 @@ class ReportActionCompose extends React.Component {
</Tooltip>
)}
</Pressable>
<Tooltip text={this.props.translate('common.send')}>
<TouchableOpacity
style={[styles.chatItemSubmitButton,
this.state.isCommentEmpty
? styles.buttonDisable : styles.buttonSuccess]}
onPress={this.submitForm}
underlayColor={themeColors.componentBG}
disabled={this.state.isCommentEmpty || isBlockedFromConcierge || isArchivedChatRoom}
>
<Icon src={Send} fill={themeColors.componentBG} />
</TouchableOpacity>
</Tooltip>
<View style={[styles.justifyContentEnd]}>
<Tooltip text={this.props.translate('common.send')}>
<TouchableOpacity
style={[styles.chatItemSubmitButton,
this.state.isCommentEmpty
? styles.buttonDisable : styles.buttonSuccess]}
onPress={this.submitForm}
underlayColor={themeColors.componentBG}
disabled={this.state.isCommentEmpty || isBlockedFromConcierge || isArchivedChatRoom}
>
<Icon src={Send} fill={themeColors.componentBG} />
</TouchableOpacity>
</Tooltip>
</View>
</View>
{this.props.network.isOffline ? (
<View style={[styles.chatItemComposeSecondaryRow]}>
Expand Down