refactor: Explain feature icon to match brand guidelines and update link press handling #83169
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -1,14 +1,20 @@ | ||
| import React from 'react'; | ||
| import {View} from 'react-native'; | ||
| import type {OnyxEntry} from 'react-native-onyx'; | ||
| import Icon from '@components/Icon'; | ||
| import RenderHTML from '@components/RenderHTML'; | ||
| import TextBlock from '@components/TextBlock'; | ||
| import TextLinkBlock from '@components/TextLinkBlock'; | ||
| import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; | ||
| import useEnvironment from '@hooks/useEnvironment'; | ||
| import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import useTheme from '@hooks/useTheme'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import {openLink} from '@libs/actions/Link'; | ||
| import {explain} from '@libs/actions/Report'; | ||
| import {hasReasoning} from '@libs/ReportActionsUtils'; | ||
| import variables from '@styles/variables'; | ||
| import type {Report, ReportAction} from '@src/types/onyx'; | ||
| import ReportActionItemBasicMessage from './ReportActionItemBasicMessage'; | ||
|
|
||
|
|
@@ -31,31 +37,49 @@ type ReportActionItemMessageWithExplainProps = { | |
| * if the action has reasoning. | ||
| */ | ||
| function ReportActionItemMessageWithExplain({message, action, childReport, originalReport}: ReportActionItemMessageWithExplainProps) { | ||
| const theme = useTheme(); | ||
| const styles = useThemeStyles(); | ||
| const {translate} = useLocalize(); | ||
| const personalDetail = useCurrentUserPersonalDetails(); | ||
| const icons = useMemoizedLazyExpensifyIcons(['Sparkles']); | ||
| const {environmentURL} = useEnvironment(); | ||
|
|
||
| const actionHasReasoning = hasReasoning(action); | ||
|
|
||
| if (!actionHasReasoning) { | ||
| return ( | ||
| <ReportActionItemBasicMessage> | ||
| <RenderHTML | ||
| html={`<comment><muted-text>${message}</muted-text></comment>`} | ||
| onLinkPress={(event, href) => { | ||
| openLink(href, environmentURL); | ||
| }} | ||
| /> | ||
| </ReportActionItemBasicMessage> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <ReportActionItemBasicMessage> | ||
| <View style={[styles.flexRow, styles.alignItemsCenter, styles.flexWrap]}> | ||
| <TextBlock | ||
| textStyles={[styles.chatItemMessage, styles.colorMuted]} | ||
| text={`${message}. `} | ||
| /> | ||
|
Comment on lines
+65
to
+68
There was a problem hiding this comment.
In the Useful? React with 👍 / 👎.
This comment was marked as outdated.
Sorry, something went wrong.
Contributor
Author
There was a problem hiding this comment. @FitseTLT I noticed that
Contributor
Author
|
||
| <View style={[styles.flexRow, styles.alignItemsCenter]}> | ||
| <TextLinkBlock | ||
| onPress={() => explain(childReport, originalReport, action, translate, personalDetail.accountID, personalDetail?.timezone)} | ||
| style={[styles.chatItemMessage, styles.link, styles.mrHalf]} | ||
| text={translate('common.explain')} | ||
| /> | ||
| <Icon | ||
| src={icons.Sparkles} | ||
| width={variables.iconSizeExtraSmall} | ||
| height={variables.iconSizeExtraSmall} | ||
| fill={theme.link} | ||
| /> | ||
| </View> | ||
| </View> | ||
| </ReportActionItemBasicMessage> | ||
| ); | ||
| } | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -143,6 +143,10 @@ export default { | |
| marginRight: 0, | ||
| }, | ||
|
|
||
| mrHalf: { | ||
| marginRight: 2, | ||
| }, | ||
|
|
||
| mr1: { | ||
| marginRight: 4, | ||
| }, | ||
|
|
||
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.
This comment was marked as off-topic.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.