From 4d9e5974c522b828d46044b52c64224d21cf1887 Mon Sep 17 00:00:00 2001 From: Sledmore Date: Wed, 16 Mar 2022 14:49:54 +0000 Subject: [PATCH 1/3] Fixes a height issue w/ marketplace items. --- src/components/catalog/CatalogView.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/catalog/CatalogView.scss b/src/components/catalog/CatalogView.scss index e90bfd58..8e353790 100644 --- a/src/components/catalog/CatalogView.scss +++ b/src/components/catalog/CatalogView.scss @@ -99,6 +99,7 @@ .layout-grid-item { height: 75px !important; max-height: 75px !important; + min-height: 75px; } } From a51ca7682a82f025b0641ee833f1f266696b014c Mon Sep 17 00:00:00 2001 From: Sledmore Date: Wed, 16 Mar 2022 15:14:45 +0000 Subject: [PATCH 2/3] Adds overflow hidden to marketplace own offers (scroll fix) --- .../layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx index 1c95a53c..2772c0d9 100644 --- a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx +++ b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx @@ -83,7 +83,7 @@ export const CatalogLayoutMarketplaceOwnItemsView: FC = prop }); return ( - + { (creditsWaiting <= 0) && { LocalizeText('catalog.marketplace.redeem.no_sold_items') } From 7f3c5eb3d201298b6974f9bbc0a647d0d0f9c01e Mon Sep 17 00:00:00 2001 From: Layne Date: Wed, 16 Mar 2022 13:56:52 -0400 Subject: [PATCH 3/3] listen for open room creator --- src/components/navigator/NavigatorMessageHandler.tsx | 10 ++++++++-- src/components/navigator/NavigatorView.tsx | 5 +++++ src/events/navigator/NavigatorEvent.ts | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/components/navigator/NavigatorMessageHandler.tsx b/src/components/navigator/NavigatorMessageHandler.tsx index 93c01d29..961c95e4 100644 --- a/src/components/navigator/NavigatorMessageHandler.tsx +++ b/src/components/navigator/NavigatorMessageHandler.tsx @@ -1,7 +1,7 @@ -import { CantConnectMessageParser, GenericErrorEvent, GetGuestRoomResultEvent, LegacyExternalInterface, NavigatorCategoriesComposer, NavigatorCategoriesEvent, NavigatorHomeRoomEvent, NavigatorMetadataEvent, NavigatorSearchEvent, NavigatorSettingsComposer, RoomCreatedEvent, RoomDataParser, RoomDoorbellAcceptedEvent, RoomDoorbellEvent, RoomDoorbellRejectedEvent, RoomEnterErrorEvent, RoomEntryInfoMessageEvent, RoomForwardEvent, RoomInfoComposer, RoomSettingsUpdatedEvent, UserInfoEvent } from '@nitrots/nitro-renderer'; +import { CantConnectMessageParser, GenericErrorEvent, GetGuestRoomResultEvent, LegacyExternalInterface, NavigatorCategoriesComposer, NavigatorCategoriesEvent, NavigatorHomeRoomEvent, NavigatorMetadataEvent, NavigatorOpenRoomCreatorEvent, NavigatorSearchEvent, NavigatorSettingsComposer, RoomCreatedEvent, RoomDataParser, RoomDoorbellAcceptedEvent, RoomDoorbellEvent, RoomDoorbellRejectedEvent, RoomEnterErrorEvent, RoomEntryInfoMessageEvent, RoomForwardEvent, RoomInfoComposer, RoomSettingsUpdatedEvent, UserInfoEvent } from '@nitrots/nitro-renderer'; import { FC, useCallback } from 'react'; import { CreateRoomSession, GetSessionDataManager, LocalizeText, NotificationAlertType, NotificationUtilities, SendMessageComposer, VisitDesktop } from '../../api'; -import { UpdateDoorStateEvent } from '../../events'; +import { NavigatorEvent, UpdateDoorStateEvent } from '../../events'; import { DispatchUiEvent, UseMessageEventHook } from '../../hooks'; import { useNavigatorContext } from './NavigatorContext'; import { NavigatorActions } from './reducers/NavigatorReducer'; @@ -221,6 +221,11 @@ export const NavigatorMessageHandler: FC<{}> = props => VisitDesktop(); }, []); + const onRoomCreatorEvent = useCallback((event: RoomEnterErrorEvent) => + { + DispatchUiEvent(new NavigatorEvent(NavigatorEvent.SHOW_ROOM_CREATOR)); + },[]); + UseMessageEventHook(UserInfoEvent, onUserInfoEvent); UseMessageEventHook(RoomForwardEvent, onRoomForwardEvent); UseMessageEventHook(RoomEntryInfoMessageEvent, onRoomEntryInfoMessageEvent); @@ -236,6 +241,7 @@ export const NavigatorMessageHandler: FC<{}> = props => UseMessageEventHook(NavigatorHomeRoomEvent, onNavigatorHomeRoomEvent); UseMessageEventHook(RoomSettingsUpdatedEvent, onRoomSettingsUpdatedEvent); UseMessageEventHook(RoomEnterErrorEvent, onRoomEnterErrorEvent); + UseMessageEventHook(NavigatorOpenRoomCreatorEvent, onRoomCreatorEvent); return null; } diff --git a/src/components/navigator/NavigatorView.tsx b/src/components/navigator/NavigatorView.tsx index da22c3ce..98595623 100644 --- a/src/components/navigator/NavigatorView.tsx +++ b/src/components/navigator/NavigatorView.tsx @@ -46,6 +46,10 @@ export const NavigatorView: FC<{}> = props => case NavigatorEvent.TOGGLE_ROOM_LINK: setRoomLinkOpen(value => !value); return; + case NavigatorEvent.SHOW_ROOM_CREATOR: + setIsVisible(true); + setCreatorOpen(true); + return; } }, []); @@ -54,6 +58,7 @@ export const NavigatorView: FC<{}> = props => UseUiEvent(NavigatorEvent.TOGGLE_NAVIGATOR, onNavigatorEvent); UseUiEvent(NavigatorEvent.TOGGLE_ROOM_INFO, onNavigatorEvent); UseUiEvent(NavigatorEvent.TOGGLE_ROOM_LINK, onNavigatorEvent); + UseUiEvent(NavigatorEvent.SHOW_ROOM_CREATOR, onNavigatorEvent); const onUpdateDoorStateEvent = useCallback((event: UpdateDoorStateEvent) => { diff --git a/src/events/navigator/NavigatorEvent.ts b/src/events/navigator/NavigatorEvent.ts index 2323940d..848e6747 100644 --- a/src/events/navigator/NavigatorEvent.ts +++ b/src/events/navigator/NavigatorEvent.ts @@ -8,6 +8,7 @@ export class NavigatorEvent extends NitroEvent public static TOGGLE_ROOM_INFO: string = 'NE_TOGGLE_ROOM_INFO'; public static TOGGLE_ROOM_LINK: string = 'NE_TOGGLE_ROOM_LINK'; public static TOGGLE_ROOM_SETTINGS: string = 'NE_TOGGLE_ROOM_SETTINGS'; + public static SHOW_ROOM_CREATOR: string = 'NE_TOGGLE_CREATOR'; private _roomId: number; private _password: string;