Merge branch 'dev' into extension-fixes

src/hooks/auth/useAuth.ts

@@ -149,8 +149,10 @@ export function useAuth() {
         bookmarkMediaToInput(tmdbId, item),
       );
 
-      await importProgress(backendUrl, account, progressInputs);
+      await Promise.all([
-      await importBookmarks(backendUrl, account, bookmarkInputs);
+        importProgress(backendUrl, account, progressInputs),
+        importBookmarks(backendUrl, account, bookmarkInputs),
+      ]);
     },
     [backendUrl],
   );
@@ -174,9 +176,11 @@ export function useAuth() {
         throw err;
       }
 
-      const bookmarks = await getBookmarks(backendUrl, account);
+      const [bookmarks, progress, settings] = await Promise.all([
-      const progress = await getProgress(backendUrl, account);
+        getBookmarks(backendUrl, account),
-      const settings = await getSettings(backendUrl, account);
+        getProgress(backendUrl, account),
+        getSettings(backendUrl, account),
+      ]);
 
       syncData(user.user, user.session, progress, bookmarks, settings);
     },