Merge for 2.2.0 release

2026-02-10 13:29:26 +01:00
parent 487927da3e
commit f51848fe65
64 changed files with 12124 additions and 2657 deletions
@@ -1319,8 +1319,14 @@ const LicencePopup = (props) => {
              >
                {`${
                  isPaidPlan ? "Next billing: " : "App runs resets on "
-                }${new Date(
-                  (localSub.enddate || localSub.Enddate) * 1000
+                }${(
+                  isPaidPlan
+                    ? new Date((localSub.enddate || localSub.Enddate) * 1000)
+                    : new Date(
+                        new Date().getFullYear(),
+                        new Date().getMonth() + 1,
+                        1
+                      )
                ).toLocaleDateString(undefined, {
                  day: "2-digit",
                  month: "short",