diff --git a/src/components/avatar-editor/AvatarEditorView.tsx b/src/components/avatar-editor/AvatarEditorView.tsx
index 77c08167..82f37790 100644
--- a/src/components/avatar-editor/AvatarEditorView.tsx
+++ b/src/components/avatar-editor/AvatarEditorView.tsx
@@ -310,17 +310,17 @@ export const AvatarEditorView: FC<{}> = props =>
-
- processAction(AvatarEditorAction.ACTION_SAVE) }>
+ processAction(AvatarEditorAction.ACTION_SAVE) }>
{ LocalizeText('avatareditor.save') }
diff --git a/src/components/camera/views/checkout/CameraWidgetCheckoutView.tsx b/src/components/camera/views/checkout/CameraWidgetCheckoutView.tsx
index f7fe7ea6..bbde7e98 100644
--- a/src/components/camera/views/checkout/CameraWidgetCheckoutView.tsx
+++ b/src/components/camera/views/checkout/CameraWidgetCheckoutView.tsx
@@ -154,7 +154,7 @@ export const CameraWidgetCheckoutView: FC = props
{ !wasPicturePublished &&
- 0)) } onClick={ event => processAction('publish') }>
+ 0)) } onClick={ event => processAction('publish') }>
{ LocalizeText('camera.publish.button.text') }
}
diff --git a/src/components/camera/views/editor/CameraWidgetEditorView.tsx b/src/components/camera/views/editor/CameraWidgetEditorView.tsx
index fb359829..1ca3e3cf 100644
--- a/src/components/camera/views/editor/CameraWidgetEditorView.tsx
+++ b/src/components/camera/views/editor/CameraWidgetEditorView.tsx
@@ -204,21 +204,21 @@ export const CameraWidgetEditorView: FC = props =>
- processAction('clear_effects') }>
+ processAction('clear_effects') }>
- processAction('download') }>
+ processAction('download') }>
- processAction('zoom') }>
+ processAction('zoom') }>
- processAction('cancel') }>
+ processAction('cancel') }>
{ LocalizeText('generic.cancel') }
- processAction('checkout') }>
+ processAction('checkout') }>
{ LocalizeText('camera.preview.button.text') }
diff --git a/src/components/camera/views/editor/effect-list/CameraWidgetEffectListItemView.tsx b/src/components/camera/views/editor/effect-list/CameraWidgetEffectListItemView.tsx
index bcfb7d3d..7451ab75 100644
--- a/src/components/camera/views/editor/effect-list/CameraWidgetEffectListItemView.tsx
+++ b/src/components/camera/views/editor/effect-list/CameraWidgetEffectListItemView.tsx
@@ -23,7 +23,7 @@ export const CameraWidgetEffectListItemView: FC (!isActive && selectEffect()) }>
{ isActive &&
-
+
}
{ !isLocked && (thumbnailUrl && thumbnailUrl.length > 0) &&
diff --git a/src/components/catalog/views/gift/CatalogGiftView.tsx b/src/components/catalog/views/gift/CatalogGiftView.tsx
index 76b59149..2da5ee13 100644
--- a/src/components/catalog/views/gift/CatalogGiftView.tsx
+++ b/src/components/catalog/views/gift/CatalogGiftView.tsx
@@ -220,7 +220,7 @@ export const CatalogGiftView: FC<{}> = props =>
{ LocalizeText('catalog.gift_wrapping.pick_color') }
- { colors.map(color => setSelectedColorId(color.id) } />) }
+ { colors.map(color => setSelectedColorId(color.id) } />) }
diff --git a/src/components/catalog/views/page/common/CatalogRedeemVoucherView.tsx b/src/components/catalog/views/page/common/CatalogRedeemVoucherView.tsx
index ba3dfdd8..c3c69886 100644
--- a/src/components/catalog/views/page/common/CatalogRedeemVoucherView.tsx
+++ b/src/components/catalog/views/page/common/CatalogRedeemVoucherView.tsx
@@ -58,7 +58,7 @@ export const CatalogRedeemVoucherView: FC = props
return (
setVoucher(event.target.value) } />
-
+
diff --git a/src/components/catalog/views/page/common/CatalogSearchView.tsx b/src/components/catalog/views/page/common/CatalogSearchView.tsx
index aa299826..d0a5281d 100644
--- a/src/components/catalog/views/page/common/CatalogSearchView.tsx
+++ b/src/components/catalog/views/page/common/CatalogSearchView.tsx
@@ -118,11 +118,11 @@ export const CatalogSearchView: FC<{}> = props =>
updateSearchValue(event.target.value) } onKeyDown={ event => ((event.code === 'Enter') || (event.code === 'NumpadEnter')) && processSearch(searchValue) } />
{ (!searchValue || !searchValue.length) &&
-
+
}
{ searchValue && !!searchValue.length &&
- updateSearchValue('') }>
+ updateSearchValue('') }>
}
diff --git a/src/components/catalog/views/page/layout/CatalogLayoutVipBuyView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutVipBuyView.tsx
index 7541e599..9d0a25ee 100644
--- a/src/components/catalog/views/page/layout/CatalogLayoutVipBuyView.tsx
+++ b/src/components/catalog/views/page/layout/CatalogLayoutVipBuyView.tsx
@@ -108,25 +108,25 @@ export const CatalogLayoutVipBuyView: FC = props =>
if(pendingOffer.priceCredits > GetCurrencyAmount(-1))
{
- return { LocalizeText('catalog.alert.notenough.title') };
+ return { LocalizeText('catalog.alert.notenough.title') };
}
if(pendingOffer.priceActivityPoints > GetCurrencyAmount(pendingOffer.priceActivityPointsType))
{
- return { LocalizeText('catalog.alert.notenough.activitypoints.title.' + pendingOffer.priceActivityPointsType) };
+ return { LocalizeText('catalog.alert.notenough.activitypoints.title.' + pendingOffer.priceActivityPointsType) };
}
switch(purchaseState)
{
case CatalogPurchaseState.CONFIRM:
- return { LocalizeText('catalog.marketplace.confirm_title') };
+ return { LocalizeText('catalog.marketplace.confirm_title') };
case CatalogPurchaseState.PURCHASE:
- return ;
+ return ;
case CatalogPurchaseState.FAILED:
- return { LocalizeText('generic.failed') };
+ return { LocalizeText('generic.failed') };
case CatalogPurchaseState.NONE:
default:
- return setPurchaseState(CatalogPurchaseState.CONFIRM) }>{ LocalizeText('buy') };
+ return setPurchaseState(CatalogPurchaseState.CONFIRM) }>{ LocalizeText('buy') };
}
}, [ pendingOffer, purchaseState, purchaseSubscription ]);
diff --git a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceItemView.tsx b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceItemView.tsx
index 828461eb..6dd57954 100644
--- a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceItemView.tsx
+++ b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceItemView.tsx
@@ -84,15 +84,15 @@ export const CatalogLayoutMarketplaceItemView: FC = pr
{ ((type === OWN_OFFER) && (offerData.status !== MarketPlaceOfferState.SOLD)) &&
- onClick(offerData) }>
+ onClick(offerData) }>
{ LocalizeText('catalog.marketplace.offer.pick') }
}
{ type === PUBLIC_OFFER &&
<>
- onClick(offerData) }>
+ onClick(offerData) }>
{ LocalizeText('buy') }
-
+
{ LocalizeText('catalog.marketplace.view_more') }
> }
diff --git a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx
index 710d422a..1c95a53c 100644
--- a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx
+++ b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx
@@ -93,7 +93,7 @@ export const CatalogLayoutMarketplaceOwnItemsView: FC = prop
{ LocalizeText('catalog.marketplace.redeem.get_credits', ['count', 'credits'], [ soldOffers.length.toString(), creditsWaiting.toString() ]) }
-
+
{ LocalizeText('catalog.marketplace.offer.redeem') }
}
diff --git a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplacePublicItemsView.tsx b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplacePublicItemsView.tsx
index 8079ef9f..9b4bea6c 100644
--- a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplacePublicItemsView.tsx
+++ b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplacePublicItemsView.tsx
@@ -142,13 +142,13 @@ export const CatalogLayoutMarketplacePublicItemsView: FC
- setSearchType(MarketplaceSearchType.BY_ACTIVITY) }>
+ setSearchType(MarketplaceSearchType.BY_ACTIVITY) }>
{ LocalizeText('catalog.marketplace.search_by_activity') }
- setSearchType(MarketplaceSearchType.BY_VALUE) }>
+ setSearchType(MarketplaceSearchType.BY_VALUE) }>
{ LocalizeText('catalog.marketplace.search_by_value') }
- setSearchType(MarketplaceSearchType.ADVANCED) }>
+ setSearchType(MarketplaceSearchType.ADVANCED) }>
{ LocalizeText('catalog.marketplace.search_advanced') }
diff --git a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceSearchFormView.tsx b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceSearchFormView.tsx
index 8397059b..f8f643e1 100644
--- a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceSearchFormView.tsx
+++ b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceSearchFormView.tsx
@@ -69,7 +69,7 @@ export const SearchFormView: FC = props =>
setMax(event.target.valueAsNumber) } />
- { LocalizeText('generic.search') }
+ { LocalizeText('generic.search') }
> }
);
diff --git a/src/components/catalog/views/page/layout/marketplace/MarketplacePostOfferView.tsx b/src/components/catalog/views/page/layout/marketplace/MarketplacePostOfferView.tsx
index 5634b618..694dfefc 100644
--- a/src/components/catalog/views/page/layout/marketplace/MarketplacePostOfferView.tsx
+++ b/src/components/catalog/views/page/layout/marketplace/MarketplacePostOfferView.tsx
@@ -116,7 +116,7 @@ export const MarketplacePostOfferView : FC<{}> = props =>
{ LocalizeText('inventory.marketplace.make_offer.final_price', [ 'commission', 'finalprice' ], [ marketplaceConfiguration.commission.toString(), (askingPrice + marketplaceConfiguration.commission).toString() ]) }
}
- marketplaceConfiguration.maximumPrice) || isNaN(askingPrice)) } onClick={ postItem }>
+ marketplaceConfiguration.maximumPrice) || isNaN(askingPrice)) } onClick={ postItem }>
{ LocalizeText('inventory.marketplace.make_offer.post') }
diff --git a/src/components/catalog/views/page/layout/vip-gifts/VipGiftItemView.tsx b/src/components/catalog/views/page/layout/vip-gifts/VipGiftItemView.tsx
index fdd9cdb7..a3d2114b 100644
--- a/src/components/catalog/views/page/layout/vip-gifts/VipGiftItemView.tsx
+++ b/src/components/catalog/views/page/layout/vip-gifts/VipGiftItemView.tsx
@@ -49,7 +49,7 @@ export const VipGiftItem : FC = props =>
{ getItemTitle() }
- onSelect(offer.localizationId) }>
+ onSelect(offer.localizationId) }>
{ LocalizeText('catalog.club_gift.select') }
diff --git a/src/components/inventory/views/furniture/InventoryFurnitureSearchView.tsx b/src/components/inventory/views/furniture/InventoryFurnitureSearchView.tsx
index 2b170ccd..11705f0e 100644
--- a/src/components/inventory/views/furniture/InventoryFurnitureSearchView.tsx
+++ b/src/components/inventory/views/furniture/InventoryFurnitureSearchView.tsx
@@ -41,7 +41,7 @@ export const InventoryFurnitureSearchView: FC
return (
setSearchValue(event.target.value) } />
-
+
diff --git a/src/components/navigator/views/room-doorbell/NavigatorRoomDoorbellView.tsx b/src/components/navigator/views/room-doorbell/NavigatorRoomDoorbellView.tsx
index 41db0ec4..34b0c007 100644
--- a/src/components/navigator/views/room-doorbell/NavigatorRoomDoorbellView.tsx
+++ b/src/components/navigator/views/room-doorbell/NavigatorRoomDoorbellView.tsx
@@ -50,10 +50,10 @@ export const NavigatorRoomDoorbellView: FC = pro
{ (state === UpdateDoorStateEvent.START_DOORBELL) &&
-
+
{ LocalizeText('navigator.doorbell.button.ring') }
}
-
+
{ LocalizeText('generic.cancel') }
diff --git a/src/components/navigator/views/room-info/NavigatorRoomInfoView.tsx b/src/components/navigator/views/room-info/NavigatorRoomInfoView.tsx
index eee574db..35fc7a70 100644
--- a/src/components/navigator/views/room-info/NavigatorRoomInfoView.tsx
+++ b/src/components/navigator/views/room-info/NavigatorRoomInfoView.tsx
@@ -1,8 +1,8 @@
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { RoomMuteComposer, RoomSettingsComposer, RoomStaffPickComposer, SecurityLevel, UserHomeRoomComposer } from '@nitrots/nitro-renderer';
import classNames from 'classnames';
-import { FC, useCallback, useEffect, useState } from 'react';
-import { GetConfiguration, GetGroupInformation, GetSessionDataManager, LocalizeText, SendMessageComposer } from '../../../../api';
+import { FC, useEffect, useState } from 'react';
+import { GetGroupInformation, GetSessionDataManager, LocalizeText, SendMessageComposer } from '../../../../api';
import { Button, Column, Flex, LayoutBadgeImageView, LayoutRoomThumbnailView, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text, UserProfileIconView } from '../../../../common';
import { FloorplanEditorEvent, NavigatorEvent, RoomWidgetThumbnailEvent } from '../../../../events';
import { BatchUpdates, DispatchUiEvent } from '../../../../hooks';
@@ -35,7 +35,7 @@ export const NavigatorRoomInfoView: FC = props =>
}
}
- const processAction = useCallback((action: string, value?: string) =>
+ const processAction = (action: string, value?: string) =>
{
if(!roomInfoData || !roomInfoData.enteredGuestRoom) return;
@@ -88,26 +88,14 @@ export const NavigatorRoomInfoView: FC = props =>
return;
}
- }, [ onCloseClick, dispatchNavigatorState, roomInfoData, homeRoomId ]);
+ }
useEffect(() =>
{
if(!roomInfoData || !roomInfoData.enteredGuestRoom) return;
- let thumbnailUrl: string = null;
-
- if(roomInfoData.enteredGuestRoom.officialRoomPicRef)
- {
- thumbnailUrl = (GetConfiguration('image.library.url') + roomInfoData.enteredGuestRoom.officialRoomPicRef);
- }
- else
- {
- thumbnailUrl = (GetConfiguration('thumbnails.url').replace('%thumbnail%', roomInfoData.enteredGuestRoom.roomId.toString()));
- }
-
BatchUpdates(() =>
{
- setRoomThumbnail(thumbnailUrl);
setIsRoomPicked(roomInfoData.enteredGuestRoom.roomPicker);
setIsRoomMuted(roomInfoData.enteredGuestRoom.allInRoomMuted);
});
@@ -141,9 +129,10 @@ export const NavigatorRoomInfoView: FC = props =>
{ LocalizeText('navigator.roomrating') }
{ roomInfoData.enteredGuestRoom.score }
- { (roomInfoData.enteredGuestRoom.tags.length > 0) &&
+ {
- { roomInfoData.enteredGuestRoom.tags.map(tag =>
+ processAction('navigator_search_tag', 'test') }>#test
+ { (roomInfoData.enteredGuestRoom.tags.length > 0) && roomInfoData.enteredGuestRoom.tags.map(tag =>
{
return processAction('navigator_search_tag', tag) }>#{ tag }
}) }
@@ -161,7 +150,7 @@ export const NavigatorRoomInfoView: FC = props =>
}
- { roomInfoData.enteredGuestRoom.description }
+ { roomInfoData.enteredGuestRoom.description }
{ (roomInfoData.enteredGuestRoom.habboGroupId > 0) &&
processAction('open_group_info') }>
@@ -173,16 +162,18 @@ export const NavigatorRoomInfoView: FC = props =>
{ hasPermission('staff_pick') &&
- processAction('toggle_pick') }>
+ processAction('toggle_pick') }>
{ LocalizeText(isRoomPicked ? 'navigator.staffpicks.unpick' : 'navigator.staffpicks.pick') }
}
-
+
{ LocalizeText('help.emergency.main.report.room') }
{ hasPermission('settings') &&
- processAction('toggle_mute') }>
- { LocalizeText(isRoomMuted ? 'navigator.muteall_on' : 'navigator.muteall_off') }
- }
+ <>
+ processAction('toggle_mute') }>
+ { LocalizeText(isRoomMuted ? 'navigator.muteall_on' : 'navigator.muteall_off') }
+
+ > }
> }
diff --git a/src/components/navigator/views/room-password/NavigatorRoomPasswordView.tsx b/src/components/navigator/views/room-password/NavigatorRoomPasswordView.tsx
index 12023947..1503dec1 100644
--- a/src/components/navigator/views/room-password/NavigatorRoomPasswordView.tsx
+++ b/src/components/navigator/views/room-password/NavigatorRoomPasswordView.tsx
@@ -49,9 +49,9 @@ export const NavigatorRoomPasswordView: FC = pro
{ LocalizeText('navigator.password.enter') }
setPassword(event.target.value) } />
-
+
{ LocalizeText('navigator.password.button.try') }
-
+
{ LocalizeText('generic.cancel') }
diff --git a/src/components/navigator/views/search/NavigatorSearchView.tsx b/src/components/navigator/views/search/NavigatorSearchView.tsx
index df426603..0ab7a2a3 100644
--- a/src/components/navigator/views/search/NavigatorSearchView.tsx
+++ b/src/components/navigator/views/search/NavigatorSearchView.tsx
@@ -55,7 +55,7 @@ export const NavigatorSearchView: FC = props =>
setSearchValue(event.target.value) } onKeyDown={ event => handleKeyDown(event) } />
-
+