diff --git a/webapp/package-lock.json b/webapp/package-lock.json index 24c1f8b19..2b826646a 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -26,9 +26,9 @@ "dcl-catalyst-commons": "^9.0.1", "decentraland-connect": "^5.2.4", "decentraland-crypto-fetch": "^1.0.3", - "decentraland-dapps": "^16.26.1", + "decentraland-dapps": "^16.28.1", "decentraland-transactions": "^1.50.0", - "decentraland-ui": "^4.31.0", + "decentraland-ui": "^4.34.0", "dotenv": "^10.0.0", "ethers": "^5.6.8", "graphql": "^14.7.0", @@ -11001,9 +11001,9 @@ } }, "node_modules/decentraland-dapps": { - "version": "16.26.1", - "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-16.26.1.tgz", - "integrity": "sha512-8jfMUgnuspF6AzjqVkPo9qZaybXlxGWSlONLNAM2YCAVr/ms5ZGgf9Nj83ZP+fa0Rfbl81m0qQK20Kk93NjOAA==", + "version": "16.28.1", + "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-16.28.1.tgz", + "integrity": "sha512-JE/uVHIXAigsxtyrN//t9DV5nYcU2RzXaLF8xC+uvz5SCPHTpDIjlV37VyJOdLrKIXaqL2FWM8Mr3v4pjwQWwg==", "dependencies": { "@0xsequence/multicall": "^0.25.1", "@0xsequence/relayer": "^0.25.1", @@ -11019,7 +11019,7 @@ "decentraland-connect": "^5.2.4", "decentraland-crypto-fetch": "^2.0.1", "decentraland-transactions": "^1.47.0", - "decentraland-ui": "^4.33.2", + "decentraland-ui": "^4.34.0", "ethers": "^5.6.8", "events": "^3.3.0", "flat": "^5.0.2", @@ -11132,9 +11132,9 @@ } }, "node_modules/decentraland-ui": { - "version": "4.33.2", - "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.33.2.tgz", - "integrity": "sha512-onZiT65/cybdwqB7dy1p3ZUVkz/1hN0ZXg97usFcPDCk2WNoYULbPqDjpOg+F3TTaSNmTU9QqpJ0pHYF/iaLkg==", + "version": "4.34.0", + "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.34.0.tgz", + "integrity": "sha512-o0g+4ZYZBIUDcN7EVfMjxg21M0CmTq1YJeF4o+snKjkcowvmnpgD0R8Yw3j5n/CiRGWGJFRgzbIP2owfo+u48Q==", "dependencies": { "@dcl/schemas": "^9.10.0", "@dcl/ui-env": "^1.4.0", diff --git a/webapp/package.json b/webapp/package.json index ac8326fd9..1a88454b2 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -20,9 +20,9 @@ "dcl-catalyst-commons": "^9.0.1", "decentraland-connect": "^5.2.4", "decentraland-crypto-fetch": "^1.0.3", - "decentraland-dapps": "^16.26.1", + "decentraland-dapps": "^16.28.1", "decentraland-transactions": "^1.50.0", - "decentraland-ui": "^4.31.0", + "decentraland-ui": "^4.34.0", "dotenv": "^10.0.0", "ethers": "^5.6.8", "graphql": "^14.7.0", diff --git a/webapp/src/components/NamesPage/ClaimNamePage/ClaimNamePage.module.css b/webapp/src/components/NamesPage/ClaimNamePage/ClaimNamePage.module.css index bb744287a..0226edb21 100644 --- a/webapp/src/components/NamesPage/ClaimNamePage/ClaimNamePage.module.css +++ b/webapp/src/components/NamesPage/ClaimNamePage/ClaimNamePage.module.css @@ -149,14 +149,12 @@ } .claimNamePage .claimContainer { + border-radius: 16px; + padding: 24px; + margin-top: 12px; width: calc(100% - 6px); - border-radius: 14.482757568359375px; - background-color: linear-gradient( - 116deg, - rgba(255, 188, 91, 0.1) 0%, - rgba(255, 45, 85, 0.1) 50.52%, - rgba(198, 64, 205, 0.1) 100% - ); + background-image: url('../../../images/names/gradient-background.svg'); + background-size: cover; display: flex; flex-direction: column; diff --git a/webapp/src/components/NamesPage/ClaimNamePage/ClaimNamePage.tsx b/webapp/src/components/NamesPage/ClaimNamePage/ClaimNamePage.tsx index 40fe87e8a..df2f9249f 100644 --- a/webapp/src/components/NamesPage/ClaimNamePage/ClaimNamePage.tsx +++ b/webapp/src/components/NamesPage/ClaimNamePage/ClaimNamePage.tsx @@ -259,7 +259,7 @@ const ClaimNamePage = (props: Props) => {
-
+
{isInputFocus ? ( setIsInputFocus(false)} /> ) : null} diff --git a/webapp/src/images/names/gradient-background.svg b/webapp/src/images/names/gradient-background.svg new file mode 100644 index 000000000..6b56f0ea2 --- /dev/null +++ b/webapp/src/images/names/gradient-background.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/webapp/src/modules/features/selectors.spec.ts b/webapp/src/modules/features/selectors.spec.ts index 4d42fe296..ea572c142 100644 --- a/webapp/src/modules/features/selectors.spec.ts +++ b/webapp/src/modules/features/selectors.spec.ts @@ -24,7 +24,6 @@ import { getIsRentalPriceFilterChartEnabled, getIsSmartWearablesFTUEnabled, isLoadingFeatureFlags, - getIsNewNavbarDropdownEnabled, getIsBuyCrossChainEnabled, getIsAuthDappEnabled } from './selectors' @@ -213,11 +212,6 @@ const waitForInitialLoadingSelectors = [ feature: FeatureName.EMOTES_V2_FTU, selector: getIsEmotesV2FTUEnabled }, - { - name: 'navbar-dropdown', - feature: FeatureName.NEW_NAVBAR_DROPDOWN, - selector: getIsNewNavbarDropdownEnabled - }, { name: 'buy-crosschain', feature: FeatureName.BUY_CROSS_CHAIN, @@ -231,59 +225,60 @@ const waitForInitialLoadingSelectors = [ } ] -waitForInitialLoadingSelectors.forEach(({ name, feature, applicationName, selector }) => - describe(`when getting if the ${name} feature flag is enabled`, () => { - describe('when the initial flags have not been yet loaded', () => { - beforeEach(() => { - hasLoadedInitialFlagsMock.mockReturnValueOnce(false) - }) - - it('should return false', () => { - const isEnabled = selector(state) - - expect(isEnabled).toBe(false) - expect(getIsFeatureEnabledMock).not.toHaveBeenCalled() - }) - }) - - describe('when the initial flags have not been yet loaded', () => { - beforeEach(() => { - hasLoadedInitialFlagsMock.mockReturnValueOnce(true) - }) - - describe('when the feature is not enabled', () => { +waitForInitialLoadingSelectors.forEach( + ({ name, feature, applicationName, selector }) => + describe(`when getting if the ${name} feature flag is enabled`, () => { + describe('when the initial flags have not been yet loaded', () => { beforeEach(() => { - getIsFeatureEnabledMock.mockReturnValueOnce(false) + hasLoadedInitialFlagsMock.mockReturnValueOnce(false) }) it('should return false', () => { const isEnabled = selector(state) expect(isEnabled).toBe(false) - expect(getIsFeatureEnabledMock).toHaveBeenCalledWith( - state, - applicationName || ApplicationName.MARKETPLACE, - feature - ) + expect(getIsFeatureEnabledMock).not.toHaveBeenCalled() }) }) - describe('when the feature is enabled', () => { + describe('when the initial flags have not been yet loaded', () => { beforeEach(() => { - getIsFeatureEnabledMock.mockReturnValueOnce(true) + hasLoadedInitialFlagsMock.mockReturnValueOnce(true) }) - it('should return true', () => { - const isEnabled = selector(state) + describe('when the feature is not enabled', () => { + beforeEach(() => { + getIsFeatureEnabledMock.mockReturnValueOnce(false) + }) + + it('should return false', () => { + const isEnabled = selector(state) - expect(isEnabled).toBe(true) - expect(getIsFeatureEnabledMock).toHaveBeenCalledWith( - state, - applicationName || ApplicationName.MARKETPLACE, - feature - ) + expect(isEnabled).toBe(false) + expect(getIsFeatureEnabledMock).toHaveBeenCalledWith( + state, + applicationName || ApplicationName.MARKETPLACE, + feature + ) + }) + }) + + describe('when the feature is enabled', () => { + beforeEach(() => { + getIsFeatureEnabledMock.mockReturnValueOnce(true) + }) + + it('should return true', () => { + const isEnabled = selector(state) + + expect(isEnabled).toBe(true) + expect(getIsFeatureEnabledMock).toHaveBeenCalledWith( + state, + applicationName || ApplicationName.MARKETPLACE, + feature + ) + }) }) }) }) - }) ) diff --git a/webapp/src/modules/features/selectors.ts b/webapp/src/modules/features/selectors.ts index 0769c3a4f..3e42f6fd8 100644 --- a/webapp/src/modules/features/selectors.ts +++ b/webapp/src/modules/features/selectors.ts @@ -196,16 +196,6 @@ export const getIsEmotesV2FTUEnabled = (state: RootState) => { return false } -export const getIsNewNavbarDropdownEnabled = (state: RootState) => { - if (hasLoadedInitialFlags(state)) { - return getIsFeatureEnabled( - state, - ApplicationName.MARKETPLACE, - FeatureName.NEW_NAVBAR_DROPDOWN - ) - } - return false -} export const getIsMarketplaceServerEnabled = (state: RootState) => { if (hasLoadedInitialFlags(state)) { return getIsFeatureEnabled( diff --git a/webapp/src/modules/features/types.ts b/webapp/src/modules/features/types.ts index 10c1ce505..1eb7ff6db 100644 --- a/webapp/src/modules/features/types.ts +++ b/webapp/src/modules/features/types.ts @@ -16,7 +16,6 @@ export enum FeatureName { HANDS_CATEGORY = 'hands-category', EMOTES_V2 = 'emotes-2.0', EMOTES_V2_FTU = 'emotes-2.0-ftu', - NEW_NAVBAR_DROPDOWN = 'new-navbar-dropdown', SMART_WEARABLES_FTU = 'smart-wearables-ftu', MARKETPLACE_SERVER = 'marketplace-server', BUY_CROSS_CHAIN = 'buy-cross-chain',