File tree Expand file tree Collapse file tree 3 files changed +20
-7
lines changed Expand file tree Collapse file tree 3 files changed +20
-7
lines changed Original file line number Diff line number Diff line change @@ -2,8 +2,11 @@ import React from 'react';
2
2
3
3
import { useIntl } from '@edx/frontend-platform/i18n' ;
4
4
5
- import { stepStates } from 'constants/index' ;
6
- import { useStepState } from 'hooks/app' ;
5
+ import { stepNames , stepStates } from 'constants/index' ;
6
+
7
+ import { useGlobalState } from 'hooks/app' ;
8
+ import { useViewStep } from 'hooks/routing' ;
9
+ import { isXblockStep } from 'utils' ;
7
10
8
11
import useInstructionsMessage from './useInstructionsMessage' ;
9
12
@@ -12,13 +15,18 @@ import messages from './messages';
12
15
const Instructions = ( ) => {
13
16
const { formatMessage } = useIntl ( ) ;
14
17
const message = useInstructionsMessage ( ) ;
15
- const stepState = useStepState ( { } ) ;
16
- if ( stepState !== stepStates . inProgress ) {
18
+ const viewStep = useViewStep ( ) ;
19
+ const { activeStepName, stepState } = useGlobalState ( ) ;
20
+ const stepName = isXblockStep ( viewStep ) ? activeStepName : viewStep ;
21
+ if ( stepState !== stepStates . inProgress || stepName === stepNames . staff ) {
17
22
return null ;
18
23
}
19
24
return (
20
25
< div className = "py-4" >
21
- < p className = "mb-0" > < strong > { formatMessage ( messages . instructions ) } : </ strong > { message } </ p >
26
+ < p className = "mb-0" >
27
+ < strong > { formatMessage ( messages . instructions ) } : </ strong >
28
+ { message }
29
+ </ p >
22
30
</ div >
23
31
) ;
24
32
} ;
Original file line number Diff line number Diff line change @@ -17,8 +17,8 @@ const Prompt = ({
17
17
const { formatMessage } = useIntl ( ) ;
18
18
const viewStep = useViewStep ( ) ;
19
19
const activeStepName = useActiveStepName ( ) ;
20
- const message = messages [ viewStep ] || messages [ activeStepName ] ;
21
- const promptTitle = title || formatMessage ( message ) || '' ;
20
+ const message = messages [ viewStep ] || messages [ activeStepName ] || messages . promptTitle ;
21
+ const promptTitle = title || formatMessage ( message ) ;
22
22
const imgRegex = / i m g s r c = " \/ a s s e t - v 1 ( [ ^ " ] * ) ? " / g;
23
23
const linkRegex = / a h r e f = " \/ a s s e t - v 1 ( [ ^ " ] * ) ? " / g;
24
24
const { baseAssetUrl } = useORAConfigData ( ) ;
Original file line number Diff line number Diff line change @@ -27,6 +27,11 @@ const messages = defineMessages({
27
27
description : 'Done step prompt header' ,
28
28
id : 'frontend-app-ora.Prompt.header.done' ,
29
29
} ,
30
+ promptTitle : {
31
+ defaultMessage : 'Prompt' ,
32
+ description : 'Prompt title' ,
33
+ id : 'frontend-app-ora.Prompt.promptTitle' ,
34
+ } ,
30
35
} ) ;
31
36
32
37
export default messages ;
You can’t perform that action at this time.
0 commit comments