diff --git a/src/stores/avatar.js b/src/stores/avatar.js index d1c64fc1..89798eeb 100644 --- a/src/stores/avatar.js +++ b/src/stores/avatar.js @@ -194,7 +194,7 @@ export const useAvatarStore = defineStore('Avatar', () => { userStore.userDialog.visible = false; worldStore.worldDialog.visible = false; groupStore.groupDialog.visible = false; - D.visible = true; + D.loading = true; D.id = avatarId; D.inCache = false; @@ -222,7 +222,6 @@ export const useAvatarStore = defineStore('Avatar', () => { if (typeof ref2 !== 'undefined') { D.ref = ref2; uiStore.setDialogCrumbLabel('avatar', D.id, D.ref?.name || D.id); - updateVRChatAvatarCache(); if ( ref2.releaseStatus !== 'public' && ref2.authorId !== userStore.currentUser.id @@ -242,6 +241,7 @@ export const useAvatarStore = defineStore('Avatar', () => { D.ref?.name || D.id ); getAvatarGallery(avatarId); + D.visible = true; updateVRChatAvatarCache(); if (/quest/.test(ref.tags)) { D.isQuestFallback = true; diff --git a/src/stores/group.js b/src/stores/group.js index a7e4de79..86f02d10 100644 --- a/src/stores/group.js +++ b/src/stores/group.js @@ -149,7 +149,6 @@ export const useGroupStore = defineStore('Group', () => { worldStore.worldDialog.visible = false; avatarStore.avatarDialog.visible = false; const D = groupDialog.value; - D.visible = true; D.loading = true; D.id = groupId; D.inGroup = false; @@ -188,6 +187,7 @@ export const useGroupStore = defineStore('Group', () => { ); D.inGroup = args.ref.membershipStatus === 'member'; D.ownerDisplayName = args.ref.ownerId; + D.visible = true; userRequest .getCachedUser({ userId: args.ref.ownerId diff --git a/src/stores/user.js b/src/stores/user.js index d473a9f4..ce6f1601 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -1,4 +1,4 @@ -import { computed, reactive, ref, shallowReactive, watch } from 'vue'; +import { computed, nextTick, reactive, ref, shallowReactive, watch } from 'vue'; import { defineStore } from 'pinia'; import { toast } from 'vue-sonner'; import { useI18n } from 'vue-i18n'; @@ -799,7 +799,7 @@ export const useUserStore = defineStore('User', () => { } } }); - D.visible = true; + D.loading = true; D.avatars = []; D.worlds = []; @@ -900,8 +900,6 @@ export const useUserStore = defineStore('User', () => { } else if (D.ref.friendRequestStatus === 'outgoing') { D.outgoingRequest = true; } - applyUserDialogLocation(true); - userRequest.getUser(args.params); let inCurrentWorld = false; if ( @@ -1018,6 +1016,8 @@ export const useUserStore = defineStore('User', () => { groupStore.handleGroupRepresented(args1); }); D.loading = false; + D.visible = true; + applyUserDialogLocation(true); }); } }); diff --git a/src/stores/world.js b/src/stores/world.js index 503ac434..2069fd79 100644 --- a/src/stores/world.js +++ b/src/stores/world.js @@ -103,7 +103,6 @@ export const useWorldStore = defineStore('World', () => { D.treeData = {}; D.bundleSizes = []; D.lastUpdated = ''; - D.visible = false; D.loading = true; D.inCache = false; D.cacheSize = ''; @@ -166,6 +165,7 @@ export const useWorldStore = defineStore('World', () => { D.id, D.ref?.name || D.id ); + D.visible = true; D.isFavorite = favoriteStore.getCachedFavoritesByObjectId( D.id ); diff --git a/src/views/Notifications/columns.jsx b/src/views/Notifications/columns.jsx index 29005b87..f31e4af6 100644 --- a/src/views/Notifications/columns.jsx +++ b/src/views/Notifications/columns.jsx @@ -5,7 +5,8 @@ import { Tooltip, TooltipContent, TooltipProvider, - TooltipTrigger + TooltipTrigger, + TooltipWrapper } from '../../components/ui/tooltip'; import { ArrowUpDown, @@ -467,27 +468,47 @@ export const createColumns = ({ {original.message && original.message !== `This is a generated invite to ${original.details?.worldName}` ? ( - - {original.message} - + + + {original.message} + + ) : null} {!original.message && original.details?.inviteMessage ? ( - - {original.details.inviteMessage} - + + + {original.details.inviteMessage} + + ) : null} {!original.message && original.details?.requestMessage ? ( - - {original.details.requestMessage} - + + + {original.details.requestMessage} + + ) : null} {!original.message && original.details?.responseMessage ? ( - - {original.details.responseMessage} - + + + {original.details.responseMessage} + + ) : null} );