From 617c16e445d15a0ca2e787091696fe235011e7ed Mon Sep 17 00:00:00 2001
From: Gildas Garcia <1122076+djhi@users.noreply.github.com>
Date: Tue, 16 Feb 2021 11:18:48 +0100
Subject: [PATCH] Fix DataProvider Stacked Queries Resolution

---
 packages/ra-core/src/dataProvider/useDataProvider.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/ra-core/src/dataProvider/useDataProvider.ts b/packages/ra-core/src/dataProvider/useDataProvider.ts
index e8f17b3ef9c..9a1efa8ea6f 100644
--- a/packages/ra-core/src/dataProvider/useDataProvider.ts
+++ b/packages/ra-core/src/dataProvider/useDataProvider.ts
@@ -217,7 +217,9 @@ const later = (delay = 100): Promise<void> =>
 // get a Promise that resolves once a condition is satisfied
 const waitFor = (condition: () => boolean): Promise<void> =>
     new Promise(resolve =>
-        condition() ? resolve() : later().then(() => waitFor(condition))
+        condition()
+            ? resolve()
+            : later().then(() => waitFor(condition).then(() => resolve()))
     );
 
 export default useDataProvider;