Fix loading states

actualbudget · Nov 14, 2024 · 33e6c56 · 33e6c56
1 parent f528c51
commit 33e6c56
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/loot-core/src/client/data-hooks/schedules.tsx b/packages/loot-core/src/client/data-hooks/schedules.tsx
@@ -66,7 +66,7 @@ type UseSchedulesResult = ScheduleData & {
 export function useSchedules({
   query,
 }: UseSchedulesProps = {}): UseSchedulesResult {
-  const [isLoading, setIsLoading] = useState(false);
+  const [isLoading, setIsLoading] = useState(query != null);
   const [error, setError] = useState<Error | undefined>(undefined);
   const [data, setData] = useState<ScheduleData>({
     schedules: [],

diff --git a/packages/loot-core/src/client/data-hooks/transactions.ts b/packages/loot-core/src/client/data-hooks/transactions.ts
@@ -34,7 +34,7 @@ export function useTransactions({
   query,
   options = { pageCount: 50 },
 }: UseTransactionsProps): UseTransactionsResult {
-  const [isLoading, setIsLoading] = useState(false);
+  const [isLoading, setIsLoading] = useState(query != null);
   const [error, setError] = useState<Error | undefined>(undefined);
   const [transactions, setTransactions] = useState<
     ReadonlyArray<TransactionEntity>
@@ -113,7 +113,7 @@ export function usePreviewTransactions(): UsePreviewTransactionsResult {
     schedules,
     statuses,
   } = useCachedSchedules();
-  const [isLoading, setIsLoading] = useState(false);
+  const [isLoading, setIsLoading] = useState(isSchedulesLoading);
   const [error, setError] = useState<Error | undefined>(undefined);
 
   const scheduleTransactions = useMemo(() => {

diff --git a/packages/loot-core/src/client/query-hooks.ts b/packages/loot-core/src/client/query-hooks.ts
@@ -21,7 +21,7 @@ export function useQuery<Response = unknown>(
   const query = useMemo(makeQuery, dependencies);
 
   const [data, setData] = useState<ReadonlyArray<Response> | null>(null);
-  const [isLoading, setIsLoading] = useState(query !== null);
+  const [isLoading, setIsLoading] = useState(query != null);
   const [error, setError] = useState<Error | undefined>(undefined);
 
   useEffect(() => {