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

fix(features): fix a bug related to the color of the total hours description component #3012

Merged
merged 8 commits into from
Nov 23, 2024
+3 −2
Merged

fix(features): fix a bug related to the color of the total hours description component #3012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84593fe
feat(features): add tooltips for speakers_catalog and fix bug with it…
FussuChalice Oct 31, 2024
9ab1049
Merge branch 'sws2apps:main' into main
FussuChalice Nov 2, 2024
b649d82
Merge branch 'sws2apps:main' into main
FussuChalice Nov 3, 2024
c67e52d
Merge branch 'sws2apps:main' into main
FussuChalice Nov 4, 2024
cca1acd
Merge branch 'sws2apps:main' into main
FussuChalice Nov 21, 2024
f395175
Merge branch 'sws2apps:main' into main
FussuChalice Nov 22, 2024
6cef8d4
fix(features): fix bug with text color and add localization string fo…
FussuChalice Nov 22, 2024
b2e90b2
Merge branch 'main' into CU-86c0wkzzc_Report--Total-hours-description…
FussuChalice Nov 22, 2024
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 ...features/ministry/report/publisher_report/monthly_report/hours_fields/hour_item/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const HourItem = () => {
</Box>

{hoursCreditEnabled && (
<Typography className="body-small-regular" color="var(--grey-450)">
<Typography className="body-small-regular" color="var(--grey-350)">
{t('tr_includesServiceAndCredit')}
</Typography>
)}
Expand Down
3 changes: 2 additions & 1 deletion src/locales/en/ministry.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,6 @@
"tr_reportVerified": "Verified reports",
"tr_reportUnverified": "Reports awaiting verification",
"tr_unverifiedReportTitle": "You have unverified reports",
"tr_unverifiedReportDesc": "Open the <a title=''>Field service reports</a> page to check and verify reports from the publishers."
"tr_unverifiedReportDesc": "Open the <a title=''>Field service reports</a> page to check and verify reports from the publishers.",
"tr_pioneers": "Pioneers"
}