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.

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

fix (MWPW-142578): Removes prettyDate from details #125

Merged
merged 8 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion dist/app.css

Large diffs are not rendered by default.

678 changes: 181 additions & 497 deletions dist/main.js

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions dist/main.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/main.source.js

Large diffs are not rendered by default.

36,654 changes: 1,246 additions & 35,408 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"babel-preset-env": "^1.7.0",
"babel-preset-jest": "^22.4.4",
"babel-preset-react": "^6.24.1",
"chromedriver": "^119.0.0",
"chromedriver": "^120.0.0",
"commitizen": "^4.2.6",
"copy-webpack-plugin": "^4.6.0",
"cross-env": "^5.2.1",
Expand Down
8 changes: 5 additions & 3 deletions react/src/js/components/Consonant/Cards/Card.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,11 @@ const Card = (props) => {
bannerDescriptionToUse = eventBanner.description;
bannerFontColorToUse = eventBanner.fontColor;
bannerIconToUse = eventBanner.icon;
const now = getCurrentDate();
if (isDateBeforeInterval(now, startDate)) {
detailText = prettyFormatDate(startDate, endDate, locale, i18nFormat);
if (isHalfHeight) {
const now = getCurrentDate();
if (isDateBeforeInterval(now, startDate)) {
detailText = prettyFormatDate(startDate, endDate, locale, i18nFormat);
}
}
}

Expand Down
Loading