diff --git a/apps/cowswap-frontend/public/halloween.css b/apps/cowswap-frontend/public/halloween.css new file mode 100644 index 0000000000..e319eae830 --- /dev/null +++ b/apps/cowswap-frontend/public/halloween.css @@ -0,0 +1,14 @@ +@keyframes blinker { + 50% { + background: black; + } + + 100% { + background: white; + } +} + +body.lightning { + filter: invert(1) grayscale(1); + animation: blinker 333ms linear infinite; +} diff --git a/apps/cowswap-frontend/src/assets/images/fortuneCookieHalloween.svg b/apps/cowswap-frontend/src/assets/images/fortuneCookieHalloween.svg deleted file mode 100644 index 7a628d55b1..0000000000 --- a/apps/cowswap-frontend/src/assets/images/fortuneCookieHalloween.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/cowswap-frontend/src/common/constants/theme.ts b/apps/cowswap-frontend/src/common/constants/theme.ts index e1e22b85ce..47cfd98680 100644 --- a/apps/cowswap-frontend/src/common/constants/theme.ts +++ b/apps/cowswap-frontend/src/common/constants/theme.ts @@ -1,9 +1,3 @@ -import fortuneCookieRegular from 'assets/images/fortune-cookie.png' -import fortuneCookieHalloween from 'assets/images/fortuneCookieHalloween.svg' - -// Enable to activate halloween theme elements for dark mode -export const HALLOWEEN_MODE = true - export enum UI { // Colors COLOR_WHITE = '--cow-color-white', @@ -21,13 +15,13 @@ export enum UI { COLOR_BORDER = '--cow-color-border', COLOR_CONTAINER_BG_01 = '--cow-container-bg-01', COLOR_CONTAINER_BG_02 = '--cow-container-bg-02', - + // Misc MODAL_BACKDROP = '--cow-modal-backdrop', BORDER_RADIUS_NORMAL = '--cow-border-radius-normal', PADDING_NORMAL = '--cow-padding-normal', BOX_SHADOW_NORMAL = '--cow-box-shadow-normal', - + // Icons ICON_SIZE_NORMAL = '--cow-icon-size-normal', ICON_SIZE_SMALL = '--cow-icon-size-small', @@ -71,130 +65,3 @@ export enum UI { FONT_SIZE_LARGER = '--cow-font-size-larger', FONT_SIZE_LARGEST = '--cow-font-size-largest', } - -export function cowSwapLogo(darkMode: boolean): string { - // Halloween version - const halloweenModeLogo = ` - ` - - // Regular Dark mode logo - const darkModeLogo = ` - - ` - - // Regular Light mode logo - const lightModeLogo = `` - - return darkMode && HALLOWEEN_MODE ? halloweenModeLogo : darkMode ? darkModeLogo : lightModeLogo -} - -// Footer cows image -export function footerImage(darkMode: boolean): string { - const lightModeImage = `` - - const darkModeImage = ` - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ` - - const halloweenImage = `` - - return darkMode && HALLOWEEN_MODE ? halloweenImage : darkMode ? darkModeImage : lightModeImage -} - -// Fortune cookie image -export function fortuneCookieImage(darkMode: boolean): string { - const lightModeImage = fortuneCookieRegular - const darkModeImage = fortuneCookieRegular - const halloweenImage = fortuneCookieHalloween - - return darkMode && HALLOWEEN_MODE ? halloweenImage : darkMode ? darkModeImage : lightModeImage -} diff --git a/apps/cowswap-frontend/src/legacy/components/Footer/index.tsx b/apps/cowswap-frontend/src/legacy/components/Footer/index.tsx index 538f7a2b90..d3df8aa993 100644 --- a/apps/cowswap-frontend/src/legacy/components/Footer/index.tsx +++ b/apps/cowswap-frontend/src/legacy/components/Footer/index.tsx @@ -3,8 +3,7 @@ import styled from 'styled-components/macro' import { Polling } from 'legacy/components/Header/Polling' import { useIsDarkMode } from 'legacy/state/user/hooks' - -import { footerImage } from 'common/constants/theme' +import { footerImage } from 'legacy/theme/cowSwapAssets' import { Version } from '../Version' diff --git a/apps/cowswap-frontend/src/legacy/components/Header/styled.tsx b/apps/cowswap-frontend/src/legacy/components/Header/styled.tsx index 6e6b0951b6..782ee7f9cf 100644 --- a/apps/cowswap-frontend/src/legacy/components/Header/styled.tsx +++ b/apps/cowswap-frontend/src/legacy/components/Header/styled.tsx @@ -1,6 +1,5 @@ import { PropsWithChildren } from 'react' -import SpiderRag from '@cowprotocol/assets/cow-swap/halloween-spider.svg' import { Row, RowFixed } from '@cowprotocol/ui' import useScrollPosition from '@react-hook/window-scroll' @@ -10,7 +9,6 @@ import styled, { css } from 'styled-components/macro' import { MenuFlyout, MenuSection, Content as MenuContent, MenuTitle } from 'legacy/components/MenuDropdown/styled' -import { HALLOWEEN_MODE } from 'common/constants/theme' import { UI } from 'common/constants/theme' const activeClassName = 'active' @@ -201,27 +199,6 @@ export const HeaderElement = styled(HeaderElementUni)` export const Wrapper = styled.div<{ isMobileMenuOpen: boolean }>` width: 100%; - // Halloween spider rag - ${({ theme }) => - HALLOWEEN_MODE && - theme.darkMode && - css` - &::after { - content: ''; - display: block; - background: url(${SpiderRag}) no-repeat center/contain; - height: 200px; - width: 200px; - position: fixed; - right: -42px; - top: 90px; - ${({ theme }) => theme.mediaWidth.upToSmall` - display: none; - content: none; - `}; - } - `} - ${HeaderFrame} { padding: 16px; display: flex; @@ -232,7 +209,7 @@ export const Wrapper = styled.div<{ isMobileMenuOpen: boolean }>` ${ isMobileMenuOpen && css` - position: fixed; + position: absolute; top: 0; z-index: 3; diff --git a/apps/cowswap-frontend/src/legacy/state/cowToken/middleware.ts b/apps/cowswap-frontend/src/legacy/state/cowToken/middleware.ts index 634c7ddf11..89852f3350 100644 --- a/apps/cowswap-frontend/src/legacy/state/cowToken/middleware.ts +++ b/apps/cowswap-frontend/src/legacy/state/cowToken/middleware.ts @@ -19,10 +19,6 @@ export const cowTokenMiddleware: Middleware, AppState> = const { chainId, hash } = action.payload const transaction = store.getState().transactions[chainId][hash] - // const { userDarkMode, matchesDarkMode } = store.getState().user - // const isDarkMode = userDarkMode === null ? matchesDarkMode : userDarkMode - const isDarkMode = true // TODO: revert after halloween - if (transaction.swapVCow || transaction.swapLockedGNOvCow) { const status = transaction.receipt?.status @@ -32,13 +28,13 @@ export const cowTokenMiddleware: Middleware, AppState> = ) if (status === 1 && transaction.replacementType !== 'cancel') { - cowSound = getCowSoundSuccess(isDarkMode) + cowSound = getCowSoundSuccess() if (transaction.swapVCow) { store.dispatch(setSwapVCowStatus(SwapVCowStatus.CONFIRMED)) } } else { - cowSound = getCowSoundError(isDarkMode) + cowSound = getCowSoundError() if (transaction.swapVCow) { store.dispatch(setSwapVCowStatus(SwapVCowStatus.INITIAL)) diff --git a/apps/cowswap-frontend/src/legacy/state/orders/middleware/soundMiddleware.test.ts b/apps/cowswap-frontend/src/legacy/state/orders/middleware/soundMiddleware.test.ts index f124150f29..76ba9c1439 100644 --- a/apps/cowswap-frontend/src/legacy/state/orders/middleware/soundMiddleware.test.ts +++ b/apps/cowswap-frontend/src/legacy/state/orders/middleware/soundMiddleware.test.ts @@ -21,7 +21,6 @@ describe('soundMiddleware', () => { orders: { 1: 'mock orders', }, - user: { userDarkMode: false }, } as any) jest.clearAllMocks() }) @@ -32,7 +31,6 @@ describe('soundMiddleware', () => { when(actionMock.type).thenReturn('order/fullfillOrdersBatch') when(mockStore.getState()).thenReturn({ orders: {}, - user: { userDarkMode: false }, } as any) soundMiddleware(instance(mockStore))(nextMock)(instance(actionMock)) @@ -116,7 +114,6 @@ describe('soundMiddleware', () => { }, }, }, - user: { userDarkMode: false }, } as any) soundMiddleware(instance(mockStore))(nextMock)(instance(actionMock)) @@ -142,7 +139,6 @@ describe('soundMiddleware', () => { }, }, }, - user: { userDarkMode: false }, } as any) soundMiddleware(instance(mockStore))(nextMock)(instance(actionMock)) diff --git a/apps/cowswap-frontend/src/legacy/state/orders/middleware/soundMiddleware.ts b/apps/cowswap-frontend/src/legacy/state/orders/middleware/soundMiddleware.ts index 7832744e8b..23eb9683de 100644 --- a/apps/cowswap-frontend/src/legacy/state/orders/middleware/soundMiddleware.ts +++ b/apps/cowswap-frontend/src/legacy/state/orders/middleware/soundMiddleware.ts @@ -1,11 +1,9 @@ // On each Pending, Expired, Fulfilled order action a corresponding sound is dispatched -import { getCowSoundError, getCowSoundSend, getCowSoundSuccess, isMobile } from '@cowprotocol/common-utils' +import { getCowSoundError, getCowSoundSend, getCowSoundSuccess } from '@cowprotocol/common-utils' import { isAnyOf } from '@reduxjs/toolkit' import { AnyAction, Dispatch, Middleware, MiddlewareAPI } from 'redux' -import { HALLOWEEN_MODE } from 'common/constants/theme' - import { addPopup } from '../../application/reducer' import { AppState } from '../../index' import { AddPendingOrderParams, BatchOrdersUpdateParams, UpdateOrderParams } from '../actions' @@ -30,16 +28,6 @@ const isBatchCancelOrderAction = isAnyOf(OrderActions.cancelOrdersBatch) const isFulfillOrderAction = isAnyOf(OrderActions.addPendingOrder, OrderActions.fulfillOrdersBatch) const isAddPopup = isAnyOf(addPopup) -function removeLightningEffect() { - document.body.classList.remove('lightning') -} -function addLightningEffect() { - document.body.classList.add('lightning') - setTimeout(() => { - removeLightningEffect() - }, 3000) -} - export const soundMiddleware: Middleware, AppState> = (store) => (next) => (action) => { const result = next(action) @@ -59,40 +47,27 @@ export const soundMiddleware: Middleware, AppState> = (s } } - // const { userDarkMode, matchesDarkMode } = store.getState().user - // const isDarkMode = userDarkMode === null ? matchesDarkMode : userDarkMode - const isDarkMode = true // TODO: revert after halloween - let cowSound - let showLighningEffect = false - const isHalloweenMode = HALLOWEEN_MODE && isDarkMode - const isHalloweenModeDesktop = HALLOWEEN_MODE && isDarkMode && !isMobile if (isPendingOrderAction(action)) { if (_shouldPlayPendingOrderSound(action.payload)) { - cowSound = getCowSoundSend(isHalloweenMode) - showLighningEffect = isHalloweenModeDesktop + cowSound = getCowSoundSend() } } else if (isFulfillOrderAction(action)) { - cowSound = getCowSoundSuccess(isHalloweenMode) - showLighningEffect = isHalloweenModeDesktop + cowSound = getCowSoundSuccess() } else if (isBatchExpireOrderAction(action)) { if (_shouldPlayExpiredOrderSound(action.payload, store)) { - cowSound = getCowSoundError(isHalloweenMode) + cowSound = getCowSoundError() } } else if (isBatchCancelOrderAction(action)) { - cowSound = getCowSoundError(isHalloweenMode) + cowSound = getCowSoundError() } else if (isFailedTxAction(action)) { - cowSound = getCowSoundError(isHalloweenMode) + cowSound = getCowSoundError() } else if (isUpdateOrderAction(action)) { - cowSound = _getUpdatedOrderSound(action.payload, isHalloweenMode) + cowSound = _getUpdatedOrderSound(action.payload) } if (cowSound) { - if (showLighningEffect) { - setTimeout(addLightningEffect, 300) - } cowSound.play().catch((e) => { - removeLightningEffect() console.error('🐮 Moooooo sound cannot be played', e) }) } @@ -119,10 +94,10 @@ function _shouldPlayExpiredOrderSound( }) } -function _getUpdatedOrderSound(payload: UpdateOrderParams, isHalloweenMode: boolean) { +function _getUpdatedOrderSound(payload: UpdateOrderParams) { if (!payload.order.isHidden) { // Trigger COW sound when an order is being updated to a non-hidden state - return getCowSoundSend(isHalloweenMode) + return getCowSoundSend() } return undefined } diff --git a/apps/cowswap-frontend/src/legacy/state/user/hooks.tsx b/apps/cowswap-frontend/src/legacy/state/user/hooks.tsx index d7f4002b0c..5d60adb989 100644 --- a/apps/cowswap-frontend/src/legacy/state/user/hooks.tsx +++ b/apps/cowswap-frontend/src/legacy/state/user/hooks.tsx @@ -11,6 +11,7 @@ import { SupportedChainId } from '@cowprotocol/cow-sdk' import { Currency, Percent } from '@uniswap/sdk-core' import JSBI from 'jsbi' +import { shallowEqual } from 'react-redux' import { updateRecipientToggleVisible, @@ -27,16 +28,15 @@ import { AppState } from '../index' import { setRecipient } from '../swap/actions' export function useIsDarkMode(): boolean { - return true - // const { userDarkMode, matchesDarkMode } = useAppSelector( - // ({ user: { matchesDarkMode, userDarkMode } }) => ({ - // userDarkMode, - // matchesDarkMode, - // }), - // shallowEqual - // ) - - // return userDarkMode === null ? matchesDarkMode : userDarkMode + const { userDarkMode, matchesDarkMode } = useAppSelector( + ({ user: { matchesDarkMode, userDarkMode } }) => ({ + userDarkMode, + matchesDarkMode, + }), + shallowEqual + ) + + return userDarkMode === null ? matchesDarkMode : userDarkMode } export function useDarkModeManager(): [boolean, () => void] { diff --git a/apps/cowswap-frontend/src/legacy/theme/baseTheme.tsx b/apps/cowswap-frontend/src/legacy/theme/baseTheme.tsx index e7433313db..d65e3b7ea4 100644 --- a/apps/cowswap-frontend/src/legacy/theme/baseTheme.tsx +++ b/apps/cowswap-frontend/src/legacy/theme/baseTheme.tsx @@ -11,7 +11,6 @@ import { colorsUniswap } from 'legacy/theme/colorsUniswap' import { Colors } from 'legacy/theme/styled' import { UI } from 'common/constants/theme' -import { HALLOWEEN_MODE } from 'common/constants/theme' // TODO: This shouldn't be in the base theme // Modal override items @@ -545,25 +544,4 @@ export const ThemedGlobalStyle = createGlobalStyle` } } - // Halloween theme elements - ${ - HALLOWEEN_MODE && - css` - @keyframes blinker { - 50% { - background: black; - } - - 100% { - background: white; - } - } - - body.lightning { - filter: invert(1) grayscale(1); - animation: blinker 333ms linear infinite; - } - ` - } - // ======================== ` diff --git a/apps/cowswap-frontend/src/legacy/theme/cowSwapAssets.ts b/apps/cowswap-frontend/src/legacy/theme/cowSwapAssets.ts index 1d8946d201..1997b9dce5 100644 --- a/apps/cowswap-frontend/src/legacy/theme/cowSwapAssets.ts +++ b/apps/cowswap-frontend/src/legacy/theme/cowSwapAssets.ts @@ -1,12 +1,7 @@ -import FORTUNE_COOKIE_IMAGE_REGULAR from 'assets/images/fortune-cookie.png' -import FORTUNE_COOKIE_IMAGE_HALLOWEEN from 'assets/images/fortuneCookieHalloween.svg' - -import { HALLOWEEN_MODE } from 'common/constants/theme' - export function cowSwapLogo(darkMode: boolean): string { // Halloween version - const halloweenModeLogo = ` - ` + // const darkModeLogo = ` + // ` // Regular Dark mode logo const darkModeLogo = ` @@ -16,12 +11,13 @@ export function cowSwapLogo(darkMode: boolean): string { // Regular Light mode logo const lightModeLogo = `` - return darkMode && HALLOWEEN_MODE ? halloweenModeLogo : darkMode ? darkModeLogo : lightModeLogo + return darkMode ? darkModeLogo : lightModeLogo } // Footer cows image export function footerImage(darkMode: boolean): string { const lightModeImage = `` + const darkModeImage = ` @@ -112,14 +108,8 @@ export function footerImage(darkMode: boolean): string { - ` - const halloweenImage = `` - - return darkMode && HALLOWEEN_MODE ? halloweenImage : darkMode ? darkModeImage : lightModeImage -} + + ` -// Fortune cookie image -export function fortuneCookieImage(darkMode: boolean): string { - if (darkMode && HALLOWEEN_MODE) return FORTUNE_COOKIE_IMAGE_HALLOWEEN - return darkMode ? FORTUNE_COOKIE_IMAGE_REGULAR : FORTUNE_COOKIE_IMAGE_REGULAR + return darkMode ? darkModeImage : lightModeImage } diff --git a/apps/cowswap-frontend/src/modules/fortune/containers/FortuneWidget/index.tsx b/apps/cowswap-frontend/src/modules/fortune/containers/FortuneWidget/index.tsx index b87bcb7959..0210d10a47 100644 --- a/apps/cowswap-frontend/src/modules/fortune/containers/FortuneWidget/index.tsx +++ b/apps/cowswap-frontend/src/modules/fortune/containers/FortuneWidget/index.tsx @@ -3,6 +3,7 @@ import { useSetAtom } from 'jotai' import { useCallback, useMemo, useRef, useState } from 'react' import { openFortuneCookieAnalytics, shareFortuneTwitterAnalytics } from '@cowprotocol/analytics' +import fortuneCookieImage from '@cowprotocol/assets/cow-swap/fortune-cookie.png' import twitterImage from '@cowprotocol/assets/cow-swap/twitter.svg' import { useInterval } from '@cowprotocol/common-hooks' import { addBodyClass, removeBodyClass } from '@cowprotocol/common-utils' @@ -23,7 +24,6 @@ import { updateOpenFortuneAtom, } from 'modules/fortune/state/fortuneStateAtom' -import { fortuneCookieImage } from 'common/constants/theme' import { UI } from 'common/constants/theme' import { SuccessBanner } from 'pages/Claim/styled' @@ -77,7 +77,7 @@ const FortuneButton = styled.div<{ isDailyFortuneChecked: boolean }>` --size: 90%; content: ''; display: block; - background: ${({ theme }) => `url(${fortuneCookieImage(theme.darkMode)}) no-repeat center 100% / contain`}; + background: url(${fortuneCookieImage}) no-repeat center 100% / contain; width: var(--size); height: var(--size); transition: transform 0.3s ease-in-out; diff --git a/apps/cowswap-frontend/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx b/apps/cowswap-frontend/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx index 1cbf466e14..ad624603fb 100644 --- a/apps/cowswap-frontend/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx +++ b/apps/cowswap-frontend/src/modules/limitOrders/containers/LimitOrdersWidget/index.tsx @@ -2,7 +2,6 @@ import { useAtom, useAtomValue, useSetAtom } from 'jotai' import React, { useMemo } from 'react' import { OrderKind } from '@cowprotocol/cow-sdk' -import { Layer3Banner } from '@cowprotocol/ui' import { Field } from 'legacy/state/types' @@ -16,7 +15,6 @@ import { BulletListItem, UnlockWidgetScreen } from 'modules/trade/pure/UnlockWid import { TradeFormValidation, useGetTradeFormValidation } from 'modules/tradeFormValidation' import { useSetTradeQuoteParams, useTradeQuote } from 'modules/tradeQuote' -import { FeatureGuard } from 'common/containers/FeatureGuard' import { useRateInfoParams } from 'common/hooks/useRateInfoParams' import { CurrencyInfo } from 'common/pure/CurrencyInputPanel/types' @@ -257,9 +255,6 @@ const LimitOrders = React.memo((props: LimitOrdersProps) => { inputCurrencyInfo={inputCurrencyInfo} outputCurrencyInfo={outputCurrencyInfo} /> - - - {tradeContext && ( - - - - diff --git a/apps/cowswap-frontend/src/modules/twap/hooks/useCreateTwapOrder.ts b/apps/cowswap-frontend/src/modules/twap/hooks/useCreateTwapOrder.ts index a7f0e59583..72eb4716fb 100644 --- a/apps/cowswap-frontend/src/modules/twap/hooks/useCreateTwapOrder.ts +++ b/apps/cowswap-frontend/src/modules/twap/hooks/useCreateTwapOrder.ts @@ -12,7 +12,6 @@ import { Nullish } from 'types' import { cowSwapStore } from 'legacy/state' import { dispatchPresignedOrderPosted } from 'legacy/state/orders/middleware/updateOrderPopup' -import { useIsDarkMode } from 'legacy/state/user/hooks' import { getOrderSubmitSummary } from 'legacy/utils/trade' import { updateAdvancedOrdersAtom, useAdvancedOrdersDerivedState } from 'modules/advancedOrders' @@ -56,8 +55,6 @@ export function useCreateTwapOrder() { const { priceImpact } = useTradePriceImpact() const { confirmPriceImpactWithoutFee } = useConfirmPriceImpactWithoutFee() - const darkMode = useIsDarkMode() - return useCallback( async (fallbackHandlerIsNotSet: boolean) => { if (!chainId || !account) return @@ -126,7 +123,7 @@ export function useCreateTwapOrder() { outputAmount: twapOrder.buyAmount, feeAmount: undefined, }) - getCowSoundSend(darkMode).play() + getCowSoundSend().play() dispatchPresignedOrderPosted(cowSwapStore, safeTxHash, summary, OrderClass.LIMIT, 'composable-order') uploadAppData({ chainId, orderId, appData: appDataInfo }) @@ -159,7 +156,6 @@ export function useCreateTwapOrder() { addTwapOrderToList, recipient, updateAdvancedOrdersState, - darkMode, ] ) } diff --git a/apps/cowswap-frontend/src/assets/images/fortune-cookie.png b/libs/assets/src/cow-swap/fortune-cookie.png similarity index 100% rename from apps/cowswap-frontend/src/assets/images/fortune-cookie.png rename to libs/assets/src/cow-swap/fortune-cookie.png diff --git a/libs/assets/src/cow-swap/halloween-spider.svg b/libs/assets/src/cow-swap/halloween-spider.svg index d84e2a0aab..d4754a21a2 100644 --- a/libs/assets/src/cow-swap/halloween-spider.svg +++ b/libs/assets/src/cow-swap/halloween-spider.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/libs/common-utils/src/sound.ts b/libs/common-utils/src/sound.ts index c527b14572..a73d2607b5 100644 --- a/libs/common-utils/src/sound.ts +++ b/libs/common-utils/src/sound.ts @@ -1,13 +1,6 @@ type SoundType = 'SEND' | 'SUCCESS' | 'SUCCESS_CLAIM' | 'ERROR' type Sounds = Record -const COW_SOUNDS_HALLOWEEN: Sounds = { - SEND: '/audio/halloween.mp3', - SUCCESS: '/audio/halloween.mp3', - SUCCESS_CLAIM: '/audio/success-claim.mp3', - ERROR: '/audio/error.mp3', -} - const COW_SOUNDS: Sounds = { SEND: '/audio/send.mp3', SUCCESS: '/audio/success.mp3', @@ -17,8 +10,8 @@ const COW_SOUNDS: Sounds = { const SOUND_CACHE: Record = {} -function getAudio(useHalloween: boolean, type: SoundType): HTMLAudioElement { - const soundPath = useHalloween ? COW_SOUNDS_HALLOWEEN[type] : COW_SOUNDS[type] +function getAudio(type: SoundType): HTMLAudioElement { + const soundPath = COW_SOUNDS[type] let sound = SOUND_CACHE[soundPath] if (!sound) { @@ -29,18 +22,18 @@ function getAudio(useHalloween: boolean, type: SoundType): HTMLAudioElement { return sound } -export function getCowSoundSend(useHalloween: boolean): HTMLAudioElement { - return getAudio(useHalloween, 'SEND') +export function getCowSoundSend(): HTMLAudioElement { + return getAudio('SEND') } -export function getCowSoundSuccess(useHalloween: boolean): HTMLAudioElement { - return getAudio(useHalloween, 'SUCCESS') +export function getCowSoundSuccess(): HTMLAudioElement { + return getAudio('SUCCESS') } -export function getCowSoundSuccessClaim(useHalloween: boolean): HTMLAudioElement { - return getAudio(useHalloween, 'SUCCESS_CLAIM') +export function getCowSoundSuccessClaim(): HTMLAudioElement { + return getAudio('SUCCESS_CLAIM') } -export function getCowSoundError(useHalloween: boolean): HTMLAudioElement { - return getAudio(useHalloween, 'ERROR') +export function getCowSoundError(): HTMLAudioElement { + return getAudio('ERROR') } diff --git a/libs/ui/src/pure/Layer3Banner/index.tsx b/libs/ui/src/pure/Layer3Banner/index.tsx index a0ba00611a..42b87fea5c 100644 --- a/libs/ui/src/pure/Layer3Banner/index.tsx +++ b/libs/ui/src/pure/Layer3Banner/index.tsx @@ -6,6 +6,7 @@ const Wrapper = styled.div` ` export interface Layer3BannerProps { + questId: string addMargin?: boolean } @@ -15,7 +16,7 @@ export function Layer3Banner(props: Layer3BannerProps) { -
+
) }