Skip to content

Commit 930c0d6

Browse files
authored
fix(meetings): handle missing Bible reading in S-140 schedule title
1 parent ed2c3e7 commit 930c0d6

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/services/app/schedules.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2401,9 +2401,6 @@ export const schedulesMidweekData = (
24012401

24022402
const scheduleDate = meetingDate.locale;
24032403

2404-
result.schedule_title =
2405-
scheduleDate + ' | ' + source.midweek_meeting.weekly_bible_reading[lang];
2406-
24072404
const week_type =
24082405
schedule.midweek_meeting.week_type.find(
24092406
(record) => record.type === dataView
@@ -2416,6 +2413,14 @@ export const schedulesMidweekData = (
24162413
result.week_type = week_type;
24172414
result.no_meeting = WEEK_TYPE_NO_MEETING.includes(week_type);
24182415

2416+
const bibleReading = source.midweek_meeting.weekly_bible_reading[lang];
2417+
2418+
if (!result.no_meeting && bibleReading && bibleReading.length > 0) {
2419+
result.schedule_title = scheduleDate + ' | ' + bibleReading;
2420+
} else {
2421+
result.schedule_title = scheduleDate;
2422+
}
2423+
24192424
result.full = MIDWEEK_FULL.includes(week_type);
24202425
result.treasures = MIDWEEK_WITH_TREASURES_TALKS.includes(week_type);
24212426
result.students = MIDWEEK_WITH_STUDENTS.includes(week_type);

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"jsx": "react-jsx",
44
"skipLibCheck": true,
55
"esModuleInterop": true,
6-
"moduleResolution": "Node",
6+
"moduleResolution": "bundler",
77
"module": "ESNext",
88
"types": ["@svgx/vite-plugin-react", "node", "vite/client"],
99
"lib": ["ESNext", "DOM"],

0 commit comments

Comments
 (0)