Skip to content

Commit

Permalink
Merge pull request #4654 from kobotoolbox/tone-down-over-limit-messages
Browse files Browse the repository at this point in the history
Tone down over-limit messaging for now
  • Loading branch information
jnm committed Sep 21, 2023
2 parents 70f0349 + 7f5153c commit 8dbb338
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
16 changes: 10 additions & 6 deletions jsapp/js/components/usageLimits/overLimitBanner.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ const OverLimitBanner = (props: OverLimitBannerProps) => {
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
size='m'
color={props.warning ? 'amber' : 'red'}
color={props.warning || true ? 'amber' : 'red'} // less scary color for now
/>
<div className={styles.bannerContent}>
{props.warning
Expand Down Expand Up @@ -71,8 +71,11 @@ const OverLimitBanner = (props: OverLimitBannerProps) => {
<>
<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 @@ const OverLimitBanner = (props: OverLimitBannerProps) => {
{(!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
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

0 comments on commit 8dbb338

Please sign in to comment.