Merge branch 'dev' into jajaja

# Conflicts:
#	package.json
#	src/components/hooks/useTimezone.ts
#	yarn.lock

src/components/hooks/useApi.ts

@@ -9,7 +9,7 @@ const selector = (state: { shareToken: { token?: string } }) => state.shareToken
 
 async function handleResponse(res: FetchResponse): Promise<any> {
   if (!res.ok) {
-    return Promise.reject(new Error(res.error));
+    return Promise.reject(new Error(res.error?.error || res.error || 'Unexpectd error.'));
   }
   return Promise.resolve(res.data);
 }

src/components/hooks/useTimezone.ts

@@ -2,11 +2,13 @@ import { setItem } from '@/lib/storage';
 import { TIMEZONE_CONFIG } from '@/lib/constants';
 import { formatInTimeZone, zonedTimeToUtc, utcToZonedTime } from 'date-fns-tz';
 import { useApp, setTimezone } from '@/store/app';
+import { useLocale } from './useLocale';
 
 const selector = (state: { timezone: string }) => state.timezone;
 
 export function useTimezone() {
   const timezone = useApp(selector);
+  const { dateLocale } = useLocale();
 
   const saveTimezone = (value: string) => {
     setItem(TIMEZONE_CONFIG, value);
@@ -20,6 +22,7 @@ export function useTimezone() {
         : date.split(' ').join('T') + 'Z',
       timezone,
       pattern,
+      { locale: dateLocale },
     );
   };