Skip to content
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

Feature/upgrade subscription required modal to display trial end message #1338

Merged
merged 3 commits into from
Jan 19, 2023
Merged

Feature/upgrade subscription required modal to display trial end message #1338

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70af8c6
Upgrade PremiumRequiredModal to optional show the end period messages
tomivm Jan 17, 2023
2fc7755
Remove unnecessary import
tomivm Jan 17, 2023
85def9d
rename isTryPeriodFinish prop
tomivm Jan 19, 2023
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
4 changes: 4 additions & 0 deletions src/components/PremiumFeature/PremiumFeature.messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import { defineMessages } from 'react-intl';

export default defineMessages({
tryPeriodFinishTittle: {
id: 'cboard.components.PremiumFeature.tryPeriodFinishTittle',
defaultMessage: 'Your free trial has ended'
},
featureBlockedTittle: {
id: 'cboard.components.PremiumFeature.featureBlockedTittle',
defaultMessage: 'This feature is blocked'
Expand Down
22 changes: 13 additions & 9 deletions src/components/PremiumFeature/PremiumRequiredModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import Dialog from '@material-ui/core/Dialog';

import WarningIcon from '@material-ui/icons/Warning';
import DialogContent from '@material-ui/core/DialogContent';
import DialogContentText from '@material-ui/core/DialogContentText';
import { Typography } from '@material-ui/core';
import { Link } from 'react-router-dom';

Expand All @@ -13,7 +12,16 @@ import messages from './PremiumFeature.messages';

import style from './PremiumRequiredModal.module.css';

export default function PremiumRequiredModal({ onClose }) {
export default function PremiumRequiredModal({ onClose, isTryPeriodFinish }) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change the name of the variable to isTryPeriodFinished

const dialogText = {
tittle: isTryPeriodFinish ? (
<FormattedMessage {...messages.tryPeriodFinishTittle} />
) : (
<FormattedMessage {...messages.featureBlockedTittle} />
),
body: <FormattedMessage {...messages.featureBlockedText} />
};

return (
<Dialog
open={true}
Expand All @@ -23,14 +31,10 @@ export default function PremiumRequiredModal({ onClose }) {
>
<DialogContent className={style.content}>
<WarningIcon fontSize="large" color="action" />
<Typography variant="h3">
<FormattedMessage {...messages.featureBlockedTittle} />
<Typography variant="h3">{dialogText.tittle}</Typography>
<Typography className={style.dialogText} variant="h6">
{dialogText.body}
</Typography>
<DialogContentText className={style.subscribeButton}>
<Typography variant="h6">
<FormattedMessage {...messages.featureBlockedText} />
</Typography>
</DialogContentText>
<Button
onClick={onClose}
color="primary"
Expand Down
2 changes: 1 addition & 1 deletion src/components/PremiumFeature/PremiumRequiredModal.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
margin: 2em 3em;
}

.subscribeButton {
.dialogText {
padding-bottom: 1em;
}
1 change: 1 addition & 0 deletions src/translations/src/cboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@
"cboard.components.VoiceRecorder.play": "Play recording",
"cboard.components.VoiceRecorder.clear": "Clear recording",
"cboard.components.VoiceRecorder.record": "Record",
"cboard.components.PremiumFeature.tryPeriodFinishTittle": "Your free trial has ended",
"cboard.components.PremiumFeature.featureBlockedTittle": "This feature is blocked",
"cboard.components.PremiumFeature.featureBlockedText": "Cboard disable this feature. To continue using it and all the features like public boards, online voices, advanced edit functions and many more, please upgrade",
"cboard.components.PremiumFeature.upgradeNow": "Upgrade now",
Expand Down