From 84eff878fccb4bbc2121ebe69cd4e3b73acdab0c Mon Sep 17 00:00:00 2001 From: Layne Date: Mon, 28 Mar 2022 21:07:09 -0400 Subject: [PATCH 1/3] click infostand users --- .../room/widgets/infostand/InfoStandWidgetUserView.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/room/widgets/infostand/InfoStandWidgetUserView.tsx b/src/components/room/widgets/infostand/InfoStandWidgetUserView.tsx index f6f9034a..5a81ee53 100644 --- a/src/components/room/widgets/infostand/InfoStandWidgetUserView.tsx +++ b/src/components/room/widgets/infostand/InfoStandWidgetUserView.tsx @@ -1,7 +1,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { RelationshipStatusInfoEvent, RelationshipStatusInfoMessageParser, RoomSessionFavoriteGroupUpdateEvent, RoomSessionUserBadgesEvent, RoomSessionUserFigureUpdateEvent, UserRelationshipsComposer } from '@nitrots/nitro-renderer'; import { Dispatch, FC, FocusEvent, KeyboardEvent, SetStateAction, useCallback, useEffect, useState } from 'react'; -import { CloneObject, GetConfiguration, GetGroupInformation, GetSessionDataManager, LocalizeText, RoomWidgetChangeMottoMessage, RoomWidgetUpdateInfostandUserEvent, SendMessageComposer } from '../../../../api'; +import { CloneObject, GetConfiguration, GetGroupInformation, GetSessionDataManager, GetUserProfile, LocalizeText, RoomWidgetChangeMottoMessage, RoomWidgetUpdateInfostandUserEvent, SendMessageComposer } from '../../../../api'; import { Base, Column, Flex, LayoutAvatarImageView, LayoutBadgeImageView, Text, UserProfileIconView } from '../../../../common'; import { BatchUpdates, UseEventDispatcherHook, UseMessageEventHook } from '../../../../hooks'; import { useRoomContext } from '../../RoomContext'; @@ -149,7 +149,7 @@ export const InfoStandWidgetUserView: FC = props = - + GetUserProfile(userData.webID) }> From 0773bcf04407f501b1c4b796c339eedcc2be5447 Mon Sep 17 00:00:00 2001 From: Bill Date: Wed, 30 Mar 2022 12:47:30 -0400 Subject: [PATCH 2/3] Fix achievement refresh --- src/components/achievements/AchievementsView.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/achievements/AchievementsView.tsx b/src/components/achievements/AchievementsView.tsx index 71776720..6f868503 100644 --- a/src/components/achievements/AchievementsView.tsx +++ b/src/components/achievements/AchievementsView.tsx @@ -1,6 +1,6 @@ import { AchievementData, AchievementEvent, AchievementsEvent, AchievementsScoreEvent, ILinkEventTracker, RequestAchievementsMessageComposer } from '@nitrots/nitro-renderer'; import { FC, useCallback, useEffect, useMemo, useState } from 'react'; -import { AchievementCategory, AddEventLinkTracker, GetAchievementCategoryImageUrl, GetAchievementIsIgnored, LocalizeText, RemoveLinkEventTracker, SendMessageComposer } from '../../api'; +import { AchievementCategory, AddEventLinkTracker, CloneObject, GetAchievementCategoryImageUrl, GetAchievementIsIgnored, LocalizeText, RemoveLinkEventTracker, SendMessageComposer } from '../../api'; import { Base, Column, LayoutImage, LayoutProgressBar, NitroCardContentView, NitroCardHeaderView, NitroCardSubHeaderView, NitroCardView, Text } from '../../common'; import { AchievementsUIUnseenCountEvent } from '../../events'; import { BatchUpdates, DispatchUiEvent, UseMessageEventHook } from '../../hooks'; @@ -36,7 +36,7 @@ export const AchievementsView: FC<{}> = props => } else { - const category = newValue[categoryIndex]; + const category = CloneObject(newValue[categoryIndex]); const newAchievements = [ ...category.achievements ]; const achievementIndex = newAchievements.findIndex(existing => (existing.achievementId === achievement.achievementId)); let previousAchievement: AchievementData = null; @@ -60,6 +60,8 @@ export const AchievementsView: FC<{}> = props => } category.achievements = newAchievements; + + newValue[categoryIndex] = category; } return newValue; From a3fc343418ceca6dd970bde48c4735591e748747 Mon Sep 17 00:00:00 2001 From: Bill Date: Wed, 30 Mar 2022 12:48:08 -0400 Subject: [PATCH 3/3] Fix CatalogLayoutPetView --- .../page/layout/pets/CatalogLayoutPetView.tsx | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/src/components/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx b/src/components/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx index f2b27f03..1ad6cba2 100644 --- a/src/components/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx +++ b/src/components/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx @@ -26,7 +26,7 @@ export const CatalogLayoutPetView: FC = props => const [ approvalPending, setApprovalPending ] = useState(true); const [ approvalResult, setApprovalResult ] = useState(-1); const { currentOffer = null, setCurrentOffer = null, setPurchaseOptions = null, catalogOptions = null, roomPreviewer = null } = useCatalogContext(); - const { petPalettes = [] } = catalogOptions; + const { petPalettes = null } = catalogOptions; const getColor = useMemo(() => { @@ -138,26 +138,29 @@ export const CatalogLayoutPetView: FC = props => if(!productData) return; - for(const paletteData of petPalettes) + if(petPalettes) { - if(paletteData.breed !== productData.type) continue; - - const palettes: SellablePetPaletteData[] = []; - - for(const palette of paletteData.palettes) + for(const paletteData of petPalettes) { - if(!palette.sellable) continue; - - palettes.push(palette); + if(paletteData.breed !== productData.type) continue; + + const palettes: SellablePetPaletteData[] = []; + + for(const palette of paletteData.palettes) + { + if(!palette.sellable) continue; + + palettes.push(palette); + } + + BatchUpdates(() => + { + setSelectedPaletteIndex((palettes.length ? 0 : -1)); + setSellablePalettes(palettes); + }); + + return; } - - BatchUpdates(() => - { - setSelectedPaletteIndex((palettes.length ? 0 : -1)); - setSellablePalettes(palettes); - }); - - return; } BatchUpdates(() =>