Merge pull request #748 from invoiceninja/develop

Sync main and develop
invoiceninja · Jun 14, 2023 · 724a588 · 724a588
2 parents 85a706c + ae8926d
commit 724a588
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/src/pages/dashboard/components/Totals.tsx b/src/pages/dashboard/components/Totals.tsx
@@ -79,8 +79,8 @@ export function Totals() {
   const [body, setBody] = useState<{ start_date: string; end_date: string }>({
     start_date: new Date(
       new Date().getFullYear(),
-      new Date().getMonth(),
-      new Date().getDate() - 7
+      new Date().getMonth() - 1,
+      new Date().getDate()
     )
       .toISOString()
       .split('T')[0],
@@ -111,6 +111,7 @@ export function Totals() {
           currencies.push({ value: id, label: name as unknown as string });
         });
 
+        setCurrency(parseInt(currencies[0].value));
         setCurrencies(currencies);
         setIsLoadingTotals(false);
       }

diff --git a/src/resources/lang/de/de.json b/src/resources/lang/de/de.json
diff --git a/src/resources/lang/en/en.json b/src/resources/lang/en/en.json
diff --git a/src/resources/lang/fr_CA/fr_CA.json b/src/resources/lang/fr_CA/fr_CA.json
diff --git a/src/resources/lang/hu/hu.json b/src/resources/lang/hu/hu.json
diff --git a/src/resources/lang/km_KH/km_KH.json b/src/resources/lang/km_KH/km_KH.json