- 
-
- ) : null
-}
-
-export default React.memo(EventBanner)
diff --git a/src/components/EventBanner/EventBanner.types.tsx b/src/components/EventBanner/EventBanner.types.tsx
deleted file mode 100644
index 81955d596..000000000
--- a/src/components/EventBanner/EventBanner.types.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-export type Props = {
- isCampaignEnabled: boolean
-}
-
-export type MapStateProps = Pick
- {t('event_banner.small.title')}
-
- {t('event_banner.small.subtitle', {
- event_tag: t('event_banner.event_tag'),
- enter:
- })} - -
- - })} - -
{t('home_page.title')}
{t('item_editor.right_panel.event_tag', { - event_tag: {CAMPAIGN_TAG}, - event_name: {t('campaign.name')} + event_tag: {campaignTag}, + event_name: {campaignName} })}
)} diff --git a/src/components/ItemEditorPage/RightPanel/RightPanel.types.ts b/src/components/ItemEditorPage/RightPanel/RightPanel.types.ts index 062cfbbc1..9c33a1705 100644 --- a/src/components/ItemEditorPage/RightPanel/RightPanel.types.ts +++ b/src/components/ItemEditorPage/RightPanel/RightPanel.types.ts @@ -24,6 +24,8 @@ export type Props = { isDownloading: boolean isCommitteeMember: boolean isCampaignEnabled: boolean + campaignTag?: string + campaignName?: string isVrmOptOutEnabled: boolean isWearableUtilityEnabled: boolean onSaveItem: typeof saveItemRequest @@ -58,6 +60,8 @@ export type MapStateProps = Pick< | 'isCommitteeMember' | 'canEditSelectedItem' | 'isCampaignEnabled' + | 'campaignTag' + | 'campaignName' | 'isVrmOptOutEnabled' | 'isWearableUtilityEnabled' > diff --git a/src/config/env/dev.json b/src/config/env/dev.json index 3b45ff7ad..b2b4fbb7f 100644 --- a/src/config/env/dev.json +++ b/src/config/env/dev.json @@ -45,5 +45,9 @@ "AUTH_URL": "/auth", "MARKETPLACE_SERVER_URL": "https://marketplace-api.decentraland.zone/v1", "WERT_PUBLISH_FEES_ENV": "dev", - "PEER_TESTING_URL": "https://peer-testing.decentraland.org" + "PEER_TESTING_URL": "https://peer-testing.decentraland.org", + "CONTENTFUL_ACCESS_TOKEN": "AATjg5ZJgxllQW8PBSQV4ZaY5wh9W_lQSKIiERHY-sc", + "CONTENTFUL_ENVIRONMENT": "development", + "CONTENTFUL_SPACE_ID": "ea2ybdmmn1kv", + "CONTENTFUL_ADMIN_ENTITY_ID": "3mvjCEsGUUqL22BY1vZLmZ" } diff --git a/src/index.css b/src/index.css index 1aeadc62b..1788cd8a8 100644 --- a/src/index.css +++ b/src/index.css @@ -17,6 +17,7 @@ body { #root { height: 100%; max-height: 100vh; + overflow: auto; } code { diff --git a/src/modules/common/banners.ts b/src/modules/common/banners.ts new file mode 100644 index 000000000..5cce548c4 --- /dev/null +++ b/src/modules/common/banners.ts @@ -0,0 +1,3 @@ +const BUILDER_BANNER_ID = 'builderCampaignBanner' + +export { BUILDER_BANNER_ID } diff --git a/src/modules/common/reducer.ts b/src/modules/common/reducer.ts index a1ae165b1..8ad1aad23 100644 --- a/src/modules/common/reducer.ts +++ b/src/modules/common/reducer.ts @@ -11,6 +11,7 @@ import { translationReducer as translation } from 'decentraland-dapps/dist/modul import { walletReducer as wallet } from 'decentraland-dapps/dist/modules/wallet/reducer' import { featuresReducer as features } from 'decentraland-dapps/dist/modules/features/reducer' import { gatewayReducer as gateway } from 'decentraland-dapps/dist/modules/gateway/reducer' +import { campaignReducer as campaign } from 'decentraland-dapps/dist/modules/campaign' import { RootState } from 'modules/common/types' import { assetPackReducer as assetPack } from 'modules/assetPack/reducer' @@ -43,6 +44,7 @@ export function createRootReducer(history: History) { return storageReducerWrapper( combineReducers