diff --git a/mobile/src/tasks/use-mobile-tasks-task-pagination-actions.tsx b/mobile/src/tasks/use-mobile-tasks-task-pagination-actions.tsx index 0026aa31121..ddff2421e39 100644 --- a/mobile/src/tasks/use-mobile-tasks-task-pagination-actions.tsx +++ b/mobile/src/tasks/use-mobile-tasks-task-pagination-actions.tsx @@ -48,6 +48,7 @@ export function useMobileTasksTaskPaginationActions(model: TaskListLoadingModel) loadGenerationRef, loadLinearContext, loadTasks, + loading, revalidating, selectedHostedRepos, setError, @@ -150,9 +151,10 @@ export function useMobileTasksTaskPaginationActions(model: TaskListLoadingModel) !githubCountedTotalPages && (provenPageLimit === null || githubPages.length < provenPageLimit) && hasRepoWithFullPage(githubPages.at(-1) ?? [], githubPerRepoLimit) - // A filter's kept pages stand in while it re-reads; paging from them would mix old and new rows. + // Pages kept or left from another filter stand in while a list loads; paging from them would mix old and new rows. const githubCanShowPagination = !revalidating && + !loading && (githubTotalPages > 1 || (githubPages.length > 0 && githubCanLoadUncountedNextPage)) const githubPagePickerPages = useMemo(() => { const visible = new Set() @@ -181,6 +183,7 @@ export function useMobileTasksTaskPaginationActions(model: TaskListLoadingModel) targetPage < 0 || githubPaginationLoading || revalidating || + loading || selectedHostedRepos.length === 0 ) { return @@ -267,6 +270,7 @@ export function useMobileTasksTaskPaginationActions(model: TaskListLoadingModel) githubPages, githubPaginationLoading, loadGenerationRef, + loading, revalidating, selectedHostedRepos, setGithubCountedTotalPages, diff --git a/mobile/src/tasks/use-task-list-cache.ts b/mobile/src/tasks/use-task-list-cache.ts index 61f7b66c412..e8dbbd65116 100644 --- a/mobile/src/tasks/use-task-list-cache.ts +++ b/mobile/src/tasks/use-task-list-cache.ts @@ -135,8 +135,8 @@ export function useTaskListCache(view: TaskListView) { ) }, [hostId, queryClient]) - // A read of a list starts on that filter's kept rows, else on its own rows still shown, else the spinner, so another - // filter's rows never sit under a new search; it is also the list this provider opens on next launch. + // A read of a list starts on that filter's kept rows, else on its own rows still shown, else the spinner, so a new + // search never starts on another filter's rows; it is also the list this provider opens on next launch. const begin = useCallback( (params: HostQueryParams | null, provider: string): void => { cancelRead() diff --git a/mobile/src/test-support/rpc-recording/adapters/task-list-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/task-list-mount-adapters.ts index d828e708197..ad8750958c7 100644 --- a/mobile/src/test-support/rpc-recording/adapters/task-list-mount-adapters.ts +++ b/mobile/src/test-support/rpc-recording/adapters/task-list-mount-adapters.ts @@ -191,6 +191,7 @@ export function taskListMountAdapters( loadGenerationRef: { current: 0 }, loadLinearContext: async () => {}, loadTasks: async () => {}, + loading: false, revalidating: false, selectedHostedRepos: [HOSTED_REPO], taskUiReady: true,