Skip to content

Fix UI flickering when fetching bookings for the first time #14800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2025
Merged

Fix UI flickering when fetching bookings for the first time #14800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82f3717
Add `replaceAllForSite` to `BookingsDao`
irfano Oct 22, 2025
8a2cf76
Replace `deleteAll` and `insert` with `replaceAll`
irfano Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...c/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bookings/BookingsStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ class BookingsStore @Inject internal constructor(
return@withDefaultContext WooResult(ordersResult.error)
}

if (page == 1 && filters.isEmpty() && query.isNullOrEmpty()) {
// Clear existing bookings when fetching the first page
bookingsDao.deleteAllForSite(site.localId())
}

val entities = response.result.map {
with(bookingDtoMapper) {
it.toEntity(
Expand All @@ -59,7 +54,12 @@ class BookingsStore @Inject internal constructor(
)
}
}
bookingsDao.insertOrReplace(entities)
if (page == 1 && filters.isEmpty() && query.isNullOrEmpty()) {
// Clear existing bookings and insert new ones when fetching the first page
bookingsDao.replaceAllForSite(site.localId(), entities)
} else {
bookingsDao.insertOrReplace(entities)
}
val totalPages = headersParser.getTotalPages(response.headers)
// Determine if we can load more from the total pages header if available, otherwise
// infer it from the number of items returned
Expand Down
7 changes: 7 additions & 0 deletions libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/persistence/dao/BookingsDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import androidx.room.Transaction
import kotlinx.coroutines.flow.Flow
import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsFilterOption
Expand Down Expand Up @@ -61,6 +62,12 @@ interface BookingsDao {
@Query("DELETE FROM Bookings WHERE localSiteId = :localSiteId")
suspend fun deleteAllForSite(localSiteId: LocalId)

@Transaction
suspend fun replaceAllForSite(siteId: LocalId, entities: List<BookingEntity>) {
deleteAllForSite(siteId)
insertOrReplace(entities)
}

fun observeBookings(
localSiteId: LocalId,
limit: Int? = null,
Expand Down
Loading