From 84593fe028707c8e7fa0a1a21ca864e9002a56aa Mon Sep 17 00:00:00 2001
From: Max Makaluk <70341920+FussuChalice@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:18:16 +0200
Subject: [PATCH 1/2] feat(features): add tooltips for speakers_catalog and fix
bug with italic font in tooltips
---
src/components/tooltip/index.tsx | 1 +
.../my_congregation/header/index.tsx | 19 ++++++++++++-------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/components/tooltip/index.tsx b/src/components/tooltip/index.tsx
index f25fc33428..62dc3a873a 100644
--- a/src/components/tooltip/index.tsx
+++ b/src/components/tooltip/index.tsx
@@ -35,6 +35,7 @@ const Tooltip = ({
maxWidth: '360px',
color: 'var(--white)',
fontSize: '12px',
+ fontStyle: 'normal',
border: 'none',
},
},
diff --git a/src/features/persons/speakers_catalog/my_congregation/header/index.tsx b/src/features/persons/speakers_catalog/my_congregation/header/index.tsx
index 04c9895c15..d492f44bd8 100644
--- a/src/features/persons/speakers_catalog/my_congregation/header/index.tsx
+++ b/src/features/persons/speakers_catalog/my_congregation/header/index.tsx
@@ -10,6 +10,7 @@ import { OutgoingSpeakersHeaderType } from './index.types';
import useHeader from './useHeader';
import Typography from '@components/typography';
import OutgoingSpeakersAccess from '../congregations_access';
+import Tooltip from '@components/tooltip';
const OutgoingSpeakersHeader = ({
expanded,
@@ -74,14 +75,18 @@ const OutgoingSpeakersHeader = ({
{isPublicTalkCoordinator && (
<>
-
- {!editMode && }
- {editMode && }
-
- {congAccountConnected && (
-
-
+
+
+ {!editMode && }
+ {editMode && }
+
+ {congAccountConnected && (
+
+
+
+
+
)}
>
)}
From 6cef8d47b7d4a4aa7170f9d71cd6c02d59da5093 Mon Sep 17 00:00:00 2001
From: Max Makaluk <70341920+FussuChalice@users.noreply.github.com>
Date: Fri, 22 Nov 2024 22:08:06 +0200
Subject: [PATCH 2/2] fix(features): fix bug with text color and add
localization string for 'tr_pioneers'
---
.../monthly_report/hours_fields/hour_item/index.tsx | 2 +-
src/locales/en/ministry.json | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/features/ministry/report/publisher_report/monthly_report/hours_fields/hour_item/index.tsx b/src/features/ministry/report/publisher_report/monthly_report/hours_fields/hour_item/index.tsx
index 306444fd49..58e9209e8d 100644
--- a/src/features/ministry/report/publisher_report/monthly_report/hours_fields/hour_item/index.tsx
+++ b/src/features/ministry/report/publisher_report/monthly_report/hours_fields/hour_item/index.tsx
@@ -43,7 +43,7 @@ const HourItem = () => {
{hoursCreditEnabled && (
-
+
{t('tr_includesServiceAndCredit')}
)}
diff --git a/src/locales/en/ministry.json b/src/locales/en/ministry.json
index 83d1553482..fcd7c894ba 100644
--- a/src/locales/en/ministry.json
+++ b/src/locales/en/ministry.json
@@ -118,5 +118,6 @@
"tr_reportVerified": "Verified reports",
"tr_reportUnverified": "Reports awaiting verification",
"tr_unverifiedReportTitle": "You have unverified reports",
- "tr_unverifiedReportDesc": "Open the Field service reports page to check and verify reports from the publishers."
+ "tr_unverifiedReportDesc": "Open the Field service reports page to check and verify reports from the publishers.",
+ "tr_pioneers": "Pioneers"
}