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

Jump to bottom

Tone down over-limit messaging for now #4654

Merged
merged 1 commit into from
Sep 21, 2023
Merged

Tone down over-limit messaging for now #4654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 10 additions & 6 deletions jsapp/js/components/usageLimits/overLimitBanner.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
return (
<div
className={cx(styles.limitBannerContainer, {
[styles.warningBanner]: props.warning,
[styles.warningBanner]: /* props.warning */ true, // red is too scary for now
})}
>
<Icon
name={props.warning ? 'alert' : 'warning'}
name={props.warning || true ? 'alert' : 'warning'} // less scary icon for now

Check failure on line 29 in jsapp/js/components/usageLimits/overLimitBanner.component.tsx

View workflow job for this annotation

GitHub Actions / build 

Unexpected constant condition
size='m'
color={props.warning ? 'amber' : 'red'}
color={props.warning || true ? 'amber' : 'red'} // less scary color for now

Check failure on line 31 in jsapp/js/components/usageLimits/overLimitBanner.component.tsx

View workflow job for this annotation

GitHub Actions / build 

Unexpected constant condition
/>
<div className={styles.bannerContent}>
{props.warning
Expand Down Expand Up @@ -71,8 +71,11 @@
<>
<a href={`#${ACCOUNT_ROUTES.PLAN}`} className={styles.bannerLink}>
{t('upgrade your plan')}
</a>{' '}
{t('to continue collecting data')}
</a>{' as soon as possible or ' /* tone down the language for now */}
<a href="https://www.kobotoolbox.org/contact/" target="_blank" className={styles.bannerLink}>
{'contact us'}
</a>
{' to speak with our team'}
{!props.usagePage && (
<>
{'. '}
Expand Down Expand Up @@ -103,7 +106,8 @@
{(!props.warning || props.usagePage) && (
<Button
type={'frame'}
color={'dark-red'}
/* color={'dark-red'} Perhaps should change permanently? */
color={'dark-blue'}
endIcon='arrow-right'
size='s'
label={t('Upgrade now')}
Expand Down
8 changes: 7 additions & 1 deletion jsapp/js/components/usageLimits/overLimitModal.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,17 @@ function OverLimitModal(props: OverLimitModalProps) {
<a href={`#${ACCOUNT_ROUTES.PLAN}`} className={styles.link}>
{t('upgrade your plan')}
</a>{' '}
{t('as soon as possible. You can')}{' '}
{'as soon as possible or ' /* tone down the language for now */}
<a href="https://www.kobotoolbox.org/contact/" target="_blank" className={styles.link}>
{'contact us'}
</a>
{' to speak with our team. You can '}
<a href={`#${ACCOUNT_ROUTES.USAGE}`} className={styles.link}>
{t('review your usage in account settings')}
</a>
{'.'}
</div>
{/* remove consequences for now; too scary
<p className={cx(limitBannerContainer, styles.consequences)}>
<Icon
name='warning'
Expand All @@ -86,6 +91,7 @@ function OverLimitModal(props: OverLimitModalProps) {
)}
</span>
</p>
*/}
</div>
</KoboModalContent>

Expand Down