From f99d9f713fb09757435f6279d9d35c44e0819361 Mon Sep 17 00:00:00 2001 From: Evgenii Kozlov Date: Wed, 5 Feb 2025 23:03:54 +0100 Subject: [PATCH] DROID-3181 Vault | Fix | Space with joining should not be considered as being in loading state (#2069) --- .../java/com/anytypeio/anytype/core_models/ObjectWrapper.kt | 1 + .../com/anytypeio/anytype/presentation/vault/VaultViewModel.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectWrapper.kt b/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectWrapper.kt index 84631ee433..ddd9669157 100644 --- a/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectWrapper.kt +++ b/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectWrapper.kt @@ -292,6 +292,7 @@ sealed class ObjectWrapper { return spaceLocalStatus == SpaceStatus.LOADING && spaceAccountStatus != SpaceStatus.SPACE_REMOVING && spaceAccountStatus != SpaceStatus.SPACE_DELETED + && spaceAccountStatus != SpaceStatus.SPACE_JOINING } val isActive: Boolean diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/vault/VaultViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/vault/VaultViewModel.kt index bc4c532917..c83eafc316 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/vault/VaultViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/vault/VaultViewModel.kt @@ -103,7 +103,7 @@ class VaultViewModel( } .combine(observeVaultSettings.flow()) { spaces, settings -> spaces - .filter { space -> space.isActive || space.isLoading } + .filter { space -> (space.isActive || space.isLoading) } .distinctBy { it.id } .map { space -> VaultSpaceView(