Set loading screen in VaultDetails during fetching recover state

cryptomator · Nov 13, 2023 · 3797335 · 3797335
1 parent 1f7d004
commit 3797335
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/frontend/src/components/VaultDetails.vue b/frontend/src/components/VaultDetails.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="vault == null">
+  <div v-if="vault == null || vaultRecoveryRequired == null">
     <div v-if="onFetchError == null">
       {{ t('common.loading') }}
     </div>
@@ -239,7 +239,7 @@ const claimVaultOwnershipDialog = ref<typeof ClaimVaultOwnershipDialog>();
 const claimingVaultOwnership = ref(false);
 const me = ref<UserDto>();
 
-const vaultRecoveryRequired = ref(false);
+const vaultRecoveryRequired = ref<boolean | null>(null);
 
 onMounted(fetchData);
 
@@ -250,6 +250,8 @@ async function fetchData() {
     me.value = await backend.users.me(true);
     if (props.role == 'OWNER') {
       await fetchOwnerData();
+    } else {
+      vaultRecoveryRequired.value = false;
     }
   } catch (error) {
     console.error('Fetching data failed.', error);
@@ -263,6 +265,7 @@ async function fetchOwnerData() {
       vaultKeys.value = await loadVaultKeys(vaultKeyJwe);
       (await backend.vaults.getMembers(props.vaultId)).forEach(member => members.value.set(member.id, member));
       usersRequiringAccessGrant.value = await backend.vaults.getUsersRequiringAccessGrant(props.vaultId);
+      vaultRecoveryRequired.value = false;
     } catch(error) {
       if (error instanceof ForbiddenError) {
         vaultRecoveryRequired.value = true;