@@ -46,6 +46,7 @@ import {projectProcessingIssuesMessages} from 'app/views/settings/project/projec
4646import findBestThread from './interfaces/threads/threadSelector/findBestThread' ;
4747import getThreadException from './interfaces/threads/threadSelector/getThreadException' ;
4848import EventEntry from './eventEntry' ;
49+ import EventAndScreenshot from './eventTagsAndScreenshot' ;
4950
5051const MINIFIED_DATA_JAVA_EVENT_REGEX_MATCH =
5152 / ^ ( ( [ \w \$ ] \. [ \w \$ ] { 1 , 2 } ) | ( [ \w \$ ] { 2 } \. [ \w \$ ] \. [ \w \$ ] ) ) ( \. | $ ) / g;
@@ -54,6 +55,7 @@ const defaultProps = {
5455 isShare : false ,
5556 showExampleCommit : false ,
5657 showTagSummary : true ,
58+ isBorderless : false ,
5759} ;
5860
5961type ProGuardErrors = Array < Error > ;
@@ -322,11 +324,13 @@ class EventEntries extends Component<Props, State> {
322324 showExampleCommit,
323325 showTagSummary,
324326 location,
327+ isBorderless,
325328 } = this . props ;
326329 const { proGuardErrors, isLoading} = this . state ;
327330
328331 const features = new Set ( organization ?. features ) ;
329332 const hasQueryFeature = features . has ( 'discover-query' ) ;
333+ const hasMobileScreenshotsFeature = features . has ( 'mobile-screenshots' ) ;
330334
331335 if ( ! event ) {
332336 return (
@@ -373,18 +377,32 @@ class EventEntries extends Component<Props, State> {
373377 includeBorder = { ! hasErrors }
374378 />
375379 ) }
376- { showTagSummary && (
377- < StyledEventDataSection title = { t ( 'Tags' ) } type = "tags" >
378- { hasContext && < EventContextSummary event = { event } /> }
379- < EventTags
380+ { showTagSummary &&
381+ ( hasMobileScreenshotsFeature ? (
382+ < EventAndScreenshot
380383 event = { event }
381384 organization = { organization as Organization }
382385 projectId = { project . slug }
383386 location = { location }
384387 hasQueryFeature = { hasQueryFeature }
388+ isShare = { isShare }
389+ hasContext = { hasContext }
390+ isBorderless = { isBorderless }
385391 />
386- </ StyledEventDataSection >
387- ) }
392+ ) : (
393+ ( ! ! ( event . tags ?? [ ] ) . length || hasContext ) && (
394+ < StyledEventDataSection title = { t ( 'Tags' ) } type = "tags" >
395+ { hasContext && < EventContextSummary event = { event } /> }
396+ < EventTags
397+ event = { event }
398+ organization = { organization as Organization }
399+ projectId = { project . slug }
400+ location = { location }
401+ hasQueryFeature = { hasQueryFeature }
402+ />
403+ </ StyledEventDataSection >
404+ )
405+ ) ) }
388406 { this . renderEntries ( event ) }
389407 { hasContext && < EventContexts group = { group } event = { event } /> }
390408 { event && ! objectIsEmpty ( event . context ) && < EventExtraData event = { event } /> }
0 commit comments