From 8bef2096f17121283d698004b36d491869db712b Mon Sep 17 00:00:00 2001 From: Bill Date: Thu, 3 Mar 2022 12:03:21 -0500 Subject: [PATCH] Move LayoutCurrencyIcon --- src/common/card/NitroCardView.scss | 9 +++++++++ src/common/index.scss | 7 +++++++ .../layout/LayoutCurrencyIcon.tsx} | 6 +++--- src/common/layout/index.ts | 1 + .../achievement-details/AchievementDetailsView.tsx | 8 ++------ .../figure-set/AvatarEditorFigureSetItemView.tsx | 5 ++--- .../palette-set/AvatarEditorPaletteSetItemView.tsx | 5 ++--- .../views/wardrobe/AvatarEditorWardrobeView.tsx | 5 ++--- .../views/checkout/CameraWidgetCheckoutView.tsx | 9 ++++----- src/components/catalog/views/gift/CatalogGiftView.tsx | 8 +++----- .../views/page/layout/CatalogLayoutVipBuyView.tsx | 11 +++++------ .../page/layout/pets/CatalogLayoutPetPurchaseView.tsx | 7 +++---- .../page/widgets/CatalogPriceDisplayWidgetView.tsx | 8 +++----- .../views/creator/NavigatorRoomCreatorView.tsx | 5 ++--- src/components/purse/PurseView.tsx | 5 ++--- src/components/purse/views/CurrencyView.tsx | 5 ++--- src/components/purse/views/SeasonalView.tsx | 5 ++--- .../bubble-layouts/NotificationClubGiftBubbleView.tsx | 5 ++--- .../avatar-info/AvatarInfoWidgetOwnAvatarView.tsx | 7 +++---- .../mannequin/FurnitureMannequinPreviewView.tsx | 5 ++--- .../furniture/mannequin/FurnitureMannequinView.tsx | 5 ++--- src/views/shared/Shared.scss | 1 - src/views/shared/currency-icon/CurrencyIcon.scss | 6 ------ 23 files changed, 63 insertions(+), 75 deletions(-) rename src/{views/shared/currency-icon/CurrencyIcon.tsx => common/layout/LayoutCurrencyIcon.tsx} (86%) delete mode 100644 src/views/shared/currency-icon/CurrencyIcon.scss diff --git a/src/common/card/NitroCardView.scss b/src/common/card/NitroCardView.scss index ddae298b..d1dfeb84 100644 --- a/src/common/card/NitroCardView.scss +++ b/src/common/card/NitroCardView.scss @@ -18,6 +18,8 @@ $nitro-card-tabs-height: 33px; background-color: $primary; &.bg-tertiary-split { + min-height: 28px; + max-height: 28px; position: relative; border-bottom: 2px solid darken($quaternary, 5); box-shadow: 0 2px white; @@ -33,6 +35,12 @@ $nitro-card-tabs-height: 33px; height: 2px; background-color: rgba($white, 0.3); } + + .nitro-card-header-text { + color: $white; + text-shadow: 0px 4px 4px rgba($black, 0.25); + @include font-size($h5-font-size); + } } .nitro-card-header-text { @@ -72,6 +80,7 @@ $nitro-card-tabs-height: 33px; } .nitro-card-header { + position: relative; height: 100%; .header-close { diff --git a/src/common/index.scss b/src/common/index.scss index c48a4223..3b8e0e69 100644 --- a/src/common/index.scss +++ b/src/common/index.scss @@ -253,4 +253,11 @@ } } +.nitro-currency-icon { + background-position: center; + background-repeat: no-repeat; + width: 15px; + height: 15px; +} + @import './card/NitroCardView'; diff --git a/src/views/shared/currency-icon/CurrencyIcon.tsx b/src/common/layout/LayoutCurrencyIcon.tsx similarity index 86% rename from src/views/shared/currency-icon/CurrencyIcon.tsx rename to src/common/layout/LayoutCurrencyIcon.tsx index c2220150..e1269526 100644 --- a/src/views/shared/currency-icon/CurrencyIcon.tsx +++ b/src/common/layout/LayoutCurrencyIcon.tsx @@ -1,13 +1,13 @@ import { CSSProperties, FC, useMemo } from 'react'; -import { GetConfiguration } from '../../../api'; -import { Base, BaseProps } from '../../../common/Base'; +import { GetConfiguration } from '../../api'; +import { Base, BaseProps } from '../Base'; export interface CurrencyIconProps extends BaseProps { type: number | string; } -export const CurrencyIcon: FC = props => +export const LayoutCurrencyIcon: FC = props => { const { type = '', classNames = [], style = {}, ...rest } = props; diff --git a/src/common/layout/index.ts b/src/common/layout/index.ts index a24bb276..98229b12 100644 --- a/src/common/layout/index.ts +++ b/src/common/layout/index.ts @@ -1,3 +1,4 @@ +export * from './LayoutCurrencyIcon'; export * from './LayoutGiftTagView'; export * from './LayoutGridItem'; export * from './LayoutImage'; diff --git a/src/components/achievements/views/achievement-details/AchievementDetailsView.tsx b/src/components/achievements/views/achievement-details/AchievementDetailsView.tsx index 381ee93b..6687214d 100644 --- a/src/components/achievements/views/achievement-details/AchievementDetailsView.tsx +++ b/src/components/achievements/views/achievement-details/AchievementDetailsView.tsx @@ -1,11 +1,7 @@ import { AchievementData } from '@nitrots/nitro-renderer'; import { FC } from 'react'; import { LocalizeBadgeDescription, LocalizeBadgeName, LocalizeText } from '../../../../api'; -import { Base } from '../../../../common/Base'; -import { Column } from '../../../../common/Column'; -import { Flex } from '../../../../common/Flex'; -import { Text } from '../../../../common/Text'; -import { CurrencyIcon } from '../../../../views/shared/currency-icon/CurrencyIcon'; +import { Base, Column, Flex, LayoutCurrencyIcon, Text } from '../../../../common'; import { AchievementUtilities } from '../../common/AchievementUtilities'; import { GetAchievementLevel } from '../../common/GetAchievementLevel'; import { GetScaledProgressPercent } from '../../common/GetScaledProgressPercent'; @@ -51,7 +47,7 @@ export const AchievementDetailsView: FC = props => { achievement.levelRewardPoints } - + } { (achievement.scoreLimit > 0) && diff --git a/src/components/avatar-editor/views/figure-set/AvatarEditorFigureSetItemView.tsx b/src/components/avatar-editor/views/figure-set/AvatarEditorFigureSetItemView.tsx index 8a6d8432..cda9b8e4 100644 --- a/src/components/avatar-editor/views/figure-set/AvatarEditorFigureSetItemView.tsx +++ b/src/components/avatar-editor/views/figure-set/AvatarEditorFigureSetItemView.tsx @@ -1,6 +1,5 @@ import { FC, useCallback, useEffect, useState } from 'react'; -import { LayoutGridItem, LayoutGridItemProps } from '../../../../common/layout/LayoutGridItem'; -import { CurrencyIcon } from '../../../../views/shared/currency-icon/CurrencyIcon'; +import { LayoutCurrencyIcon, LayoutGridItem, LayoutGridItemProps } from '../../../../common'; import { AvatarEditorGridPartItem } from '../../common/AvatarEditorGridPartItem'; import { AvatarEditorIcon } from '../AvatarEditorIcon'; @@ -31,7 +30,7 @@ export const AvatarEditorFigureSetItemView: FC - { partItem.isHC && } + { partItem.isHC && } { partItem.isClear && } { partItem.isSellable && } { children } diff --git a/src/components/avatar-editor/views/palette-set/AvatarEditorPaletteSetItemView.tsx b/src/components/avatar-editor/views/palette-set/AvatarEditorPaletteSetItemView.tsx index f7e09a63..94ebb40c 100644 --- a/src/components/avatar-editor/views/palette-set/AvatarEditorPaletteSetItemView.tsx +++ b/src/components/avatar-editor/views/palette-set/AvatarEditorPaletteSetItemView.tsx @@ -1,6 +1,5 @@ import { FC, useCallback, useEffect, useState } from 'react'; -import { LayoutGridItem, LayoutGridItemProps } from '../../../../common/layout/LayoutGridItem'; -import { CurrencyIcon } from '../../../../views/shared/currency-icon/CurrencyIcon'; +import { LayoutCurrencyIcon, LayoutGridItem, LayoutGridItemProps } from '../../../../common'; import { AvatarEditorGridColorItem } from '../../common/AvatarEditorGridColorItem'; export interface AvatarEditorPaletteSetItemProps extends LayoutGridItemProps @@ -27,7 +26,7 @@ export const AvatarEditorPaletteSetItem: FC = p return ( - { colorItem.isHC && } + { colorItem.isHC && } { children } ); diff --git a/src/components/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx b/src/components/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx index a5e8c616..47083c64 100644 --- a/src/components/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx +++ b/src/components/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx @@ -1,9 +1,8 @@ import { IAvatarFigureContainer, SaveWardrobeOutfitMessageComposer } from '@nitrots/nitro-renderer'; import { Dispatch, FC, SetStateAction, useCallback, useMemo } from 'react'; import { GetAvatarRenderManager, GetSessionDataManager, SendMessageComposer } from '../../../../api'; -import { AutoGrid, Base, Button, Flex, LayoutGridItem } from '../../../../common'; +import { AutoGrid, Base, Button, Flex, LayoutCurrencyIcon, LayoutGridItem } from '../../../../common'; import { AvatarImageView } from '../../../../views/shared/avatar-image/AvatarImageView'; -import { CurrencyIcon } from '../../../../views/shared/currency-icon/CurrencyIcon'; import { FigureData } from '../../common/FigureData'; export interface AvatarEditorWardrobeViewProps @@ -59,7 +58,7 @@ export const AvatarEditorWardrobeView: FC = props { figureContainer && } - { (clubLevel > 0) && } + { (clubLevel > 0) && } { figureContainer && diff --git a/src/components/camera/views/checkout/CameraWidgetCheckoutView.tsx b/src/components/camera/views/checkout/CameraWidgetCheckoutView.tsx index 83279eeb..48a23164 100644 --- a/src/components/camera/views/checkout/CameraWidgetCheckoutView.tsx +++ b/src/components/camera/views/checkout/CameraWidgetCheckoutView.tsx @@ -1,10 +1,9 @@ import { CameraPublishStatusMessageEvent, CameraPurchaseOKMessageEvent, CameraStorageUrlMessageEvent, PublishPhotoMessageComposer, PurchasePhotoMessageComposer } from '@nitrots/nitro-renderer'; import { FC, useCallback, useEffect, useState } from 'react'; import { GetConfiguration, GetRoomEngine, LocalizeText, SendMessageComposer } from '../../../../api'; -import { Button, Column, Flex, LayoutImage, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../common'; +import { Button, Column, Flex, LayoutCurrencyIcon, LayoutImage, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../common'; import { InventoryEvent } from '../../../../events'; import { BatchUpdates, DispatchUiEvent, UseMessageEventHook } from '../../../../hooks'; -import { CurrencyIcon } from '../../../../views/shared/currency-icon/CurrencyIcon'; export interface CameraWidgetCheckoutViewProps { @@ -116,12 +115,12 @@ export const CameraWidgetCheckoutView: FC = props { (price.credits > 0) && { price.credits } - + } { (price.duckets > 0) && { price.duckets } - + } } { (picturesBought > 0) && @@ -148,7 +147,7 @@ export const CameraWidgetCheckoutView: FC = props { LocalizeText('catalog.purchase.confirmation.dialog.cost') } { price.publishDucketPrice } - + } { (publishCooldown > 0) &&
{ LocalizeText('camera.publish.wait', [ 'minutes' ], [ Math.ceil( publishCooldown / 60).toString() ]) }
} diff --git a/src/components/catalog/views/gift/CatalogGiftView.tsx b/src/components/catalog/views/gift/CatalogGiftView.tsx index dc7442af..f2b0687f 100644 --- a/src/components/catalog/views/gift/CatalogGiftView.tsx +++ b/src/components/catalog/views/gift/CatalogGiftView.tsx @@ -3,11 +3,9 @@ import { PurchaseFromCatalogAsGiftComposer } from '@nitrots/nitro-renderer'; import classNames from 'classnames'; import { FC, useCallback, useEffect, useMemo, useState } from 'react'; import { GetSessionDataManager, LocalizeText, SendMessageComposer } from '../../../../api'; -import { Base, Button, ButtonGroup, Column, Flex, FormGroup, LayoutGiftTagView, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../common'; -import { CatalogEvent, CatalogPurchasedEvent } from '../../../../events'; -import { CatalogInitGiftEvent } from '../../../../events/catalog/CatalogInitGiftEvent'; +import { Base, Button, ButtonGroup, Column, Flex, FormGroup, LayoutCurrencyIcon, LayoutGiftTagView, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../common'; +import { CatalogEvent, CatalogInitGiftEvent, CatalogPurchasedEvent } from '../../../../events'; import { BatchUpdates, UseUiEvent } from '../../../../hooks'; -import { CurrencyIcon } from '../../../../views/shared/currency-icon/CurrencyIcon'; import { FurniImageView } from '../../../../views/shared/furni-image/FurniImageView'; import { useCatalogContext } from '../../CatalogContext'; import { ProductTypeEnum } from '../../common/ProductTypeEnum'; @@ -201,7 +199,7 @@ export const CatalogGiftView: FC<{}> = props => { LocalizeText(boxName) } { LocalizeText(priceText, ['price'], [giftConfiguration.price.toString()]) } - + diff --git a/src/components/catalog/views/page/layout/CatalogLayoutVipBuyView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutVipBuyView.tsx index c9fb1e68..7541e599 100644 --- a/src/components/catalog/views/page/layout/CatalogLayoutVipBuyView.tsx +++ b/src/components/catalog/views/page/layout/CatalogLayoutVipBuyView.tsx @@ -1,10 +1,9 @@ import { ClubOfferData, GetClubOffersMessageComposer, PurchaseFromCatalogComposer } from '@nitrots/nitro-renderer'; import { FC, useCallback, useEffect, useMemo, useState } from 'react'; import { LocalizeText, SendMessageComposer } from '../../../../../api'; -import { AutoGrid, Button, Column, Flex, Grid, LayoutGridItem, LayoutLoadingSpinnerView, Text } from '../../../../../common'; +import { AutoGrid, Button, Column, Flex, Grid, LayoutCurrencyIcon, LayoutGridItem, LayoutLoadingSpinnerView, Text } from '../../../../../common'; import { CatalogEvent, CatalogPurchasedEvent, CatalogPurchaseFailureEvent } from '../../../../../events'; import { UseUiEvent } from '../../../../../hooks'; -import { CurrencyIcon } from '../../../../../views/shared/currency-icon/CurrencyIcon'; import { GetCurrencyAmount } from '../../../../purse/common/CurrencyHelper'; import { GLOBAL_PURSE } from '../../../../purse/PurseView'; import { useCatalogContext } from '../../../CatalogContext'; @@ -151,12 +150,12 @@ export const CatalogLayoutVipBuyView: FC = props => { (offer.priceCredits > 0) && { offer.priceCredits } - + } { (offer.priceActivityPoints > 0) && { offer.priceActivityPoints } - + } @@ -182,12 +181,12 @@ export const CatalogLayoutVipBuyView: FC = props => { (pendingOffer.priceCredits > 0) && { pendingOffer.priceCredits } - + } { (pendingOffer.priceActivityPoints > 0) && { pendingOffer.priceActivityPoints } - + } diff --git a/src/components/catalog/views/page/layout/pets/CatalogLayoutPetPurchaseView.tsx b/src/components/catalog/views/page/layout/pets/CatalogLayoutPetPurchaseView.tsx index be5caf39..c5800e67 100644 --- a/src/components/catalog/views/page/layout/pets/CatalogLayoutPetPurchaseView.tsx +++ b/src/components/catalog/views/page/layout/pets/CatalogLayoutPetPurchaseView.tsx @@ -1,10 +1,9 @@ import { ApproveNameMessageComposer } from '@nitrots/nitro-renderer'; import { FC, useCallback, useState } from 'react'; import { LocalizeText, SendMessageComposer } from '../../../../../../api'; -import { Column, Flex, Text } from '../../../../../../common'; +import { Column, Flex, LayoutCurrencyIcon, Text } from '../../../../../../common'; import { CatalogPurchasedEvent } from '../../../../../../events'; import { UseUiEvent } from '../../../../../../hooks'; -import { CurrencyIcon } from '../../../../../../views/shared/currency-icon/CurrencyIcon'; import { IPurchasableOffer } from '../../../../common/IPurchasableOffer'; import { Offer } from '../../../../common/Offer'; import { CatalogPurchaseWidgetView } from '../../widgets/CatalogPurchaseWidgetView'; @@ -50,12 +49,12 @@ export const CatalogLayoutPetPurchaseView: FC { ((offer.priceType === Offer.PRICE_TYPE_CREDITS_ACTIVITYPOINTS) || (offer.priceType === Offer.PRICE_TYPE_CREDITS)) && { offer.priceInCredits } - + } { ((offer.priceType === Offer.PRICE_TYPE_CREDITS_ACTIVITYPOINTS) || (offer.priceType === Offer.PRICE_TYPE_ACTIVITYPOINTS)) && { offer.priceInActivityPoints } - + } diff --git a/src/components/catalog/views/page/widgets/CatalogPriceDisplayWidgetView.tsx b/src/components/catalog/views/page/widgets/CatalogPriceDisplayWidgetView.tsx index b5a6fad3..7cf8c76b 100644 --- a/src/components/catalog/views/page/widgets/CatalogPriceDisplayWidgetView.tsx +++ b/src/components/catalog/views/page/widgets/CatalogPriceDisplayWidgetView.tsx @@ -1,8 +1,6 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { FC } from 'react'; -import { Flex } from '../../../../../common/Flex'; -import { Text } from '../../../../../common/Text'; -import { CurrencyIcon } from '../../../../../views/shared/currency-icon/CurrencyIcon'; +import { Flex, LayoutCurrencyIcon, Text } from '../../../../../common'; import { useCatalogContext } from '../../../CatalogContext'; import { IPurchasableOffer } from '../../../common/IPurchasableOffer'; @@ -25,14 +23,14 @@ export const CatalogPriceDisplayWidgetView: FC 0) && { (offer.priceInCredits * quantity) } - + } { separator && (offer.priceInCredits > 0) && (offer.priceInActivityPoints > 0) && } { (offer.priceInActivityPoints > 0) && { (offer.priceInActivityPoints * quantity) } - + } ); diff --git a/src/components/navigator/views/creator/NavigatorRoomCreatorView.tsx b/src/components/navigator/views/creator/NavigatorRoomCreatorView.tsx index 0b7b5d51..d5035152 100644 --- a/src/components/navigator/views/creator/NavigatorRoomCreatorView.tsx +++ b/src/components/navigator/views/creator/NavigatorRoomCreatorView.tsx @@ -2,9 +2,8 @@ import { HabboClubLevelEnum, RoomCreateComposer } from '@nitrots/nitro-renderer'; import { FC, useEffect, useState } from 'react'; import { GetConfiguration, GetSessionDataManager, LocalizeText, SendMessageComposer } from '../../../../api'; -import { Button, Column, Flex, Grid, LayoutGridItem, Text } from '../../../../common'; +import { Button, Column, Flex, Grid, LayoutCurrencyIcon, LayoutGridItem, Text } from '../../../../common'; import { BatchUpdates } from '../../../../hooks'; -import { CurrencyIcon } from '../../../../views/shared/currency-icon/CurrencyIcon'; import { IRoomModel, RoomModels } from '../../common/RoomModels'; import { useNavigatorContext } from '../../NavigatorContext'; @@ -105,7 +104,7 @@ export const NavigatorRoomCreatorView: FC<{}> = props => { model.tileSize } { LocalizeText('navigator.createroom.tilesize') } - { model.clubLevel > HabboClubLevelEnum.NO_CLUB && } + { model.clubLevel > HabboClubLevelEnum.NO_CLUB && } ); }) } diff --git a/src/components/purse/PurseView.tsx b/src/components/purse/PurseView.tsx index 3f91b46d..f664f23e 100644 --- a/src/components/purse/PurseView.tsx +++ b/src/components/purse/PurseView.tsx @@ -1,10 +1,9 @@ import { ActivityPointNotificationMessageEvent, FriendlyTime, HabboClubLevelEnum, UserCreditsEvent, UserCurrencyComposer, UserCurrencyEvent, UserSubscriptionComposer, UserSubscriptionEvent, UserSubscriptionParser } from '@nitrots/nitro-renderer'; import { FC, useCallback, useEffect, useMemo, useState } from 'react'; import { CreateLinkEvent, CREDITS, DUCKETS, GetConfiguration, LocalizeText, PlaySound, SendMessageComposer } from '../../api'; -import { Column, Flex, Grid, Text } from '../../common'; +import { Column, Flex, Grid, LayoutCurrencyIcon, Text } from '../../common'; import { HcCenterEvent, UserSettingsUIEvent } from '../../events'; import { DispatchUiEvent, UseMessageEventHook } from '../../hooks'; -import { CurrencyIcon } from '../../views/shared/currency-icon/CurrencyIcon'; import { IPurse } from './common/IPurse'; import { Purse } from './common/Purse'; import { PurseContextProvider } from './PurseContext'; @@ -177,7 +176,7 @@ export const PurseView: FC<{}> = props => { getCurrencyElements(0, 2) } DispatchUiEvent(new HcCenterEvent(HcCenterEvent.TOGGLE_HC_CENTER)) }> - + { getClubText } diff --git a/src/components/purse/views/CurrencyView.tsx b/src/components/purse/views/CurrencyView.tsx index 27004784..73f13c03 100644 --- a/src/components/purse/views/CurrencyView.tsx +++ b/src/components/purse/views/CurrencyView.tsx @@ -1,8 +1,7 @@ import { FC, useMemo } from 'react'; import { OverlayTrigger, Tooltip } from 'react-bootstrap'; import { LocalizeFormattedNumber, LocalizeShortNumber } from '../../../api'; -import { Flex, Text } from '../../../common'; -import { CurrencyIcon } from '../../../views/shared/currency-icon/CurrencyIcon'; +import { Flex, LayoutCurrencyIcon, Text } from '../../../common'; interface CurrencyViewProps { @@ -20,7 +19,7 @@ export const CurrencyView: FC = props => return ( { short ? LocalizeShortNumber(amount) : LocalizeFormattedNumber(amount) } - + ); }, [ amount, short, type ]); diff --git a/src/components/purse/views/SeasonalView.tsx b/src/components/purse/views/SeasonalView.tsx index 49cc8930..c60824a5 100644 --- a/src/components/purse/views/SeasonalView.tsx +++ b/src/components/purse/views/SeasonalView.tsx @@ -1,7 +1,6 @@ import { FC } from 'react'; import { LocalizeFormattedNumber, LocalizeText } from '../../../api'; -import { Flex, Text } from '../../../common'; -import { CurrencyIcon } from '../../../views/shared/currency-icon/CurrencyIcon'; +import { Flex, LayoutCurrencyIcon, Text } from '../../../common'; interface SeasonalViewProps { @@ -18,7 +17,7 @@ export const SeasonalView: FC = props => { LocalizeText(`purse.seasonal.currency.${ type }`) } { LocalizeFormattedNumber(amount) } - + ); diff --git a/src/views/notification-center/views/bubble-layouts/NotificationClubGiftBubbleView.tsx b/src/views/notification-center/views/bubble-layouts/NotificationClubGiftBubbleView.tsx index 4db5568a..1df87c86 100644 --- a/src/views/notification-center/views/bubble-layouts/NotificationClubGiftBubbleView.tsx +++ b/src/views/notification-center/views/bubble-layouts/NotificationClubGiftBubbleView.tsx @@ -1,7 +1,6 @@ import { FC } from 'react'; import { LocalizeText } from '../../../../api'; -import { LayoutNotificationBubbleView } from '../../../../common'; -import { CurrencyIcon } from '../../../shared/currency-icon/CurrencyIcon'; +import { LayoutCurrencyIcon, LayoutNotificationBubbleView } from '../../../../common'; import { NotificationUtilities } from '../../common/NotificationUtilities'; import { NotificationBubbleLayoutViewProps } from './NotificationBubbleLayoutView.types'; @@ -12,7 +11,7 @@ export const NotificationClubGiftBubbleView: FC
- + { LocalizeText('notifications.text.club_gift') }
diff --git a/src/views/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx b/src/views/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx index 71a7aeff..a0952c1f 100644 --- a/src/views/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx +++ b/src/views/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx @@ -2,10 +2,9 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { AvatarAction, AvatarExpressionEnum, RoomControllerLevel, RoomObjectCategory } from '@nitrots/nitro-renderer'; import { FC, useCallback, useMemo, useState } from 'react'; import { CreateLinkEvent, GetCanStandUp, GetCanUseExpression, GetOwnPosture, GetUserProfile, HasHabboClub, HasHabboVip, IsRidingHorse, LocalizeText, RoomWidgetAvatarExpressionMessage, RoomWidgetChangePostureMessage, RoomWidgetDanceMessage, RoomWidgetMessage, RoomWidgetUpdateDecorateModeEvent, RoomWidgetUpdateInfostandUserEvent, RoomWidgetUserActionMessage } from '../../../../api'; -import { Flex } from '../../../../common'; +import { Flex, LayoutCurrencyIcon } from '../../../../common'; import { HelpNameChangeEvent } from '../../../../events'; import { DispatchUiEvent } from '../../../../hooks'; -import { CurrencyIcon } from '../../../shared/currency-icon/CurrencyIcon'; import { useRoomContext } from '../../context/RoomContext'; import { ContextMenuHeaderView } from '../context-menu/ContextMenuHeaderView'; import { ContextMenuListItemView } from '../context-menu/ContextMenuListItemView'; @@ -204,12 +203,12 @@ export const AvatarInfoWidgetOwnAvatarView: FC } { GetCanUseExpression() && processAction('laugh') }> - + { LocalizeText('widget.memenu.laugh') } } { GetCanUseExpression() && processAction('blow') }> - + { LocalizeText('widget.memenu.blow') } } processAction('idle') }> diff --git a/src/views/room/widgets/furniture/mannequin/FurnitureMannequinPreviewView.tsx b/src/views/room/widgets/furniture/mannequin/FurnitureMannequinPreviewView.tsx index a0f6dba2..a9dfa6ad 100644 --- a/src/views/room/widgets/furniture/mannequin/FurnitureMannequinPreviewView.tsx +++ b/src/views/room/widgets/furniture/mannequin/FurnitureMannequinPreviewView.tsx @@ -1,7 +1,6 @@ import { FC } from 'react'; -import { Base } from '../../../../../common'; +import { Base, LayoutCurrencyIcon } from '../../../../../common'; import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView'; -import { CurrencyIcon } from '../../../../shared/currency-icon/CurrencyIcon'; interface FurnitureMannequinPreviewViewProps { @@ -17,7 +16,7 @@ export const FurnitureMannequinPreviewView: FC { (clubLevel > 0) && - } + } ); } diff --git a/src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx b/src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx index dae6b89a..1d26436f 100644 --- a/src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx +++ b/src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx @@ -1,10 +1,9 @@ import { AvatarFigurePartType, FurnitureMannequinSaveLookComposer, FurnitureMannequinSaveNameComposer, FurnitureMultiStateComposer, HabboClubLevelEnum, IAvatarFigureContainer, RoomControllerLevel } from '@nitrots/nitro-renderer'; import { FC, KeyboardEvent, useCallback, useEffect, useState } from 'react'; import { GetAvatarRenderManager, GetSessionDataManager, LocalizeText, RoomWidgetUpdateMannequinEvent, SendMessageComposer } from '../../../../../api'; -import { Base, Button, Column, Flex, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../../common'; +import { Base, Button, Column, Flex, LayoutCurrencyIcon, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../../common'; import { BatchUpdates, UseEventDispatcherHook } from '../../../../../hooks'; import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView'; -import { CurrencyIcon } from '../../../../shared/currency-icon/CurrencyIcon'; import { useRoomContext } from '../../../context/RoomContext'; const MODE_NONE: number = -1; @@ -182,7 +181,7 @@ export const FurnitureMannequinView: FC<{}> = props => { (clubLevel > 0) && - } + } diff --git a/src/views/shared/Shared.scss b/src/views/shared/Shared.scss index 542564b8..d805f5d6 100644 --- a/src/views/shared/Shared.scss +++ b/src/views/shared/Shared.scss @@ -1,6 +1,5 @@ @import "./avatar-image/AvatarImage"; @import "./badge-image/BadgeImage"; -@import "./currency-icon/CurrencyIcon"; @import "./furni-image/FurniImageView"; @import "./limited-edition/LimitedEdition"; @import "./pet-image/PetImage"; diff --git a/src/views/shared/currency-icon/CurrencyIcon.scss b/src/views/shared/currency-icon/CurrencyIcon.scss deleted file mode 100644 index 88462829..00000000 --- a/src/views/shared/currency-icon/CurrencyIcon.scss +++ /dev/null @@ -1,6 +0,0 @@ -.nitro-currency-icon { - background-position: center; - background-repeat: no-repeat; - width: 15px; - height: 15px; -}