diff --git a/CHANGELOG.md b/CHANGELOG.md
index 179639ea8..51ec79b10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog
+## v0.130
+
+### Fixed
+
+- Calendar now uses Monday as the first day of the wek - #6715.
+
## v0.129
### Fixed
diff --git a/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.tsx.snap b/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.tsx.snap
index 417a60799..8068a7e93 100644
--- a/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.tsx.snap
+++ b/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.tsx.snap
@@ -1201,6 +1201,7 @@ exports[` 'Starts' tab matches snapshot 1`] = `
'Starts' tab matches snapshot 1`] = `
>
- |
- Su
- |
| 'Starts' tab matches snapshot 1`] = `
>
Sa
+
+ Su
+ |
+ |
+ |
+ |
+ |
+ |
+ |
| 'Starts' tab matches snapshot 1`] = `
1
+
+
| 'Starts' tab matches snapshot 1`] = `
7
-
-
| 'Starts' tab matches snapshot 1`] = `
8
+
+
| 'Starts' tab matches snapshot 1`] = `
14
-
-
| 'Starts' tab matches snapshot 1`] = `
15
+
+
| 'Starts' tab matches snapshot 1`] = `
21
-
-
| 'Starts' tab matches snapshot 1`] = `
22
+
+
| 'Starts' tab matches snapshot 1`] = `
28
-
-
| 'Starts' tab matches snapshot 1`] = `
29
- |
- |
- |
- |
- |
- |
diff --git a/ui/src/Components/SilenceModal/DateTimeSelect/index.test.tsx b/ui/src/Components/SilenceModal/DateTimeSelect/index.test.tsx
index a3b5358c9..554b9492d 100644
--- a/ui/src/Components/SilenceModal/DateTimeSelect/index.test.tsx
+++ b/ui/src/Components/SilenceModal/DateTimeSelect/index.test.tsx
@@ -228,11 +228,13 @@ describe("", () => {
"February 2060",
);
fireEvent.click(container.querySelector("button.rdp-button_next")!);
- expect(container.querySelector(".rdp-month_caption")?.textContent).toBe(
+ const captionsAfterNext = container.querySelectorAll(".rdp-month_caption");
+ expect(captionsAfterNext[captionsAfterNext.length - 1].textContent).toBe(
"March 2060",
);
fireEvent.click(container.querySelector("button.btn.btn-light.btn-sm")!);
- expect(container.querySelector(".rdp-month_caption")?.textContent).toBe(
+ const captionsAfterToday = container.querySelectorAll(".rdp-month_caption");
+ expect(captionsAfterToday[captionsAfterToday.length - 1].textContent).toBe(
format(new Date(), "LLLL yyyy"),
);
});
diff --git a/ui/src/Components/SilenceModal/DateTimeSelect/index.tsx b/ui/src/Components/SilenceModal/DateTimeSelect/index.tsx
index 9f8ad566c..3e9273631 100644
--- a/ui/src/Components/SilenceModal/DateTimeSelect/index.tsx
+++ b/ui/src/Components/SilenceModal/DateTimeSelect/index.tsx
@@ -105,6 +105,8 @@ const TabContentStart: FC<{
start: silenceFormStore.data.startsAt,
end: silenceFormStore.data.endsAt,
}}
+ weekStartsOn={1}
+ animate
/>