👋 @zwarm !

I have reviewed and tested this PR as per the instruction, good job! 🌟

Warning (⚠️): What I just noticed while running through the app and flows is that the GetRestoreStatusUseCase is running indefinitely when there is no restore in progress and the activity log screen launches. This is due to the fact that the activityLogStore.getRewindStatusForSite(site)?.rewind returns as null within the GetRestoreStatusUseCase and since it is null it never enters the next if statement, then the loop starts over resulting in the same output.

I am not sure when this was introduced or whether we missed that from the very beginning, but I am confident that if we add the emit(Empty) logic on this use case, just like we did on the getBackupDownloadStatus(...), everything will work fine. I actually tried it myself and it indeed works okay. Wdyt?

GetRestoreStatusUseCase

val rewind = activityLogStore.getRewindStatusForSite(site)?.rewind
if (rewind == null) {
    emit(Empty)
    return@flow
}
if (restoreId == null || rewind.restoreId == restoreId) { ... }

RestoreViewModel

private fun handleQueryStatus(restoreStatus: RestoreRequestState) {
    when (restoreStatus) {
        ...
        is Empty -> transitionToError(RestoreErrorTypes.RemoteRequestFailure)
        else -> ...
        }
    }

👋 @zwarm !

Just reviewed the changed and they look good to me, many thanks! 🙏

I have left a small test comment, feel free to ignore it and merge this to develop, it is now approved.