Fix extra useQuery result frames

src/core/QueryManager.ts

@@ -1333,6 +1333,7 @@ export class QueryManager<TStore> {
       returnPartialData,
       context,
       notifyOnNetworkStatusChange,
+      fetchBlockingPromise,
     }: WatchQueryOptions<TVars, TData>,
     // The initial networkStatus for this fetch, most often
     // NetworkStatus.loading, but also possibly fetchMore, poll, refetch,
@@ -1390,13 +1391,25 @@ export class QueryManager<TStore> {
       ) ? CacheWriteBehavior.OVERWRITE
         : CacheWriteBehavior.MERGE;
 
-    const resultsFromLink = () =>
-      this.getResultsFromLink<TData, TVars>(queryInfo, cacheWriteBehavior, {
-        variables,
-        context,
-        fetchPolicy,
-        errorPolicy,
-      });
+    const resultsFromLink = () => {
+      const get = () => this.getResultsFromLink<TData, TVars>(
+        queryInfo,
+        cacheWriteBehavior,
+        {
+          variables,
+          context,
+          fetchPolicy,
+          errorPolicy,
+        },
+      );
+
+      // If we have a fetchBlockingPromise, wait for it to be resolved before
+      // allowing any network requests, and only proceed if fetchBlockingPromise
+      // resolves to true. If it resolves to false, the request is discarded.
+      return fetchBlockingPromise ? fetchBlockingPromise.then(
+        ok => ok ? get() : Observable.of<ApolloQueryResult<TData>>()
+      ) : get();
+    }
 
     const shouldNotify =
       notifyOnNetworkStatusChange &&

src/core/watchQueryOptions.ts

@@ -145,6 +145,14 @@ export interface WatchQueryOptions<TVariables = OperationVariables, TData = any>
    * behavior, for backwards compatibility with Apollo Client 3.x.
    */
   refetchWritePolicy?: RefetchWritePolicy;
+
+  /**
+   * If provided, stalls any network activity for this request until the Promise
+   * has resolved. If the Promise resolves to true, the network request will
+   * proceed. If the Promise resolves to false, the network request will be
+   * silently discarded.
+   */
+  fetchBlockingPromise?: Promise<boolean>;
 }
 
 export interface NextFetchPolicyContext<TData, TVariables> {