diff --git a/webapp/src/components/Campaign/CampaignBrowserPage/CampaignBrowserPage.container.ts b/webapp/src/components/Campaign/CampaignBrowserPage/CampaignBrowserPage.container.ts index 53e9864a2c..dbea173ee9 100644 --- a/webapp/src/components/Campaign/CampaignBrowserPage/CampaignBrowserPage.container.ts +++ b/webapp/src/components/Campaign/CampaignBrowserPage/CampaignBrowserPage.container.ts @@ -22,7 +22,7 @@ const mapState = (state: RootState): MapStateProps => ({ }) const mapDispatch = (dispatch: MapDispatch) => ({ - onFetchEventContracts: (tag: string) => dispatch(fetchEventRequest(tag)) + onFetchEventContracts: (tags: string[]) => dispatch(fetchEventRequest(tags)) }) export default connect(mapState, mapDispatch)(BrowsePage) diff --git a/webapp/src/components/Campaign/CampaignBrowserPage/CampaignBrowserPage.tsx b/webapp/src/components/Campaign/CampaignBrowserPage/CampaignBrowserPage.tsx index 680156ae9b..8fd8289c41 100644 --- a/webapp/src/components/Campaign/CampaignBrowserPage/CampaignBrowserPage.tsx +++ b/webapp/src/components/Campaign/CampaignBrowserPage/CampaignBrowserPage.tsx @@ -12,7 +12,7 @@ import { Navigation } from '../../Navigation' import { AssetBrowse } from '../../AssetBrowse' import { CampaignBrowserBanner } from '../banners/CampaignBrowserBanner' import { CampaignBanner } from '../CampaignBanner' -import { CAMPAIGN_TAG } from '../config' +import { CAMPAIGN_BROWSE_TAGS, CAMPAIGN_TAG } from '../config' import { Props } from './CampaignBrowserPage.types' import './CampaignBrowserPage.css' @@ -27,7 +27,7 @@ const CampaignBrowserPage = (props: Props) => { const vendor = isVendor(props.vendor) ? props.vendor : VendorName.DECENTRALAND useEffect(() => { - onFetchEventContracts(CAMPAIGN_TAG) + onFetchEventContracts(CAMPAIGN_BROWSE_TAGS) }, [onFetchEventContracts]) const activeTab = NavigationTab.CAMPAIGN_BROWSER diff --git a/webapp/src/components/Campaign/config.ts b/webapp/src/components/Campaign/config.ts index e226e5958e..c20ac1e0b9 100644 --- a/webapp/src/components/Campaign/config.ts +++ b/webapp/src/components/Campaign/config.ts @@ -1,2 +1,3 @@ export const CAMPAIGN_TAG = 'DCLMF23' +export const CAMPAIGN_BROWSE_TAGS = [CAMPAIGN_TAG, 'MVMF22'] export const CAMPAING_TAB_ANIMATION_ENABLED = true diff --git a/webapp/src/modules/event/actions.spec.ts b/webapp/src/modules/event/actions.spec.ts index 810d2a6bbd..b8e7d3f198 100644 --- a/webapp/src/modules/event/actions.spec.ts +++ b/webapp/src/modules/event/actions.spec.ts @@ -10,34 +10,34 @@ import { const anErrorMessage = 'An error' describe('when creating the action to signal the start of the events request', () => { - let tag: string + let tags: string[] beforeEach(() => { - tag = 'a tag' + tags = ['a tag'] }) it('should return an object representing the action', () => { - expect(fetchEventRequest(tag)).toEqual({ + expect(fetchEventRequest(tags)).toEqual({ type: FETCH_EVENT_REQUEST, meta: undefined, payload: { - tag + tags } }) }) }) describe('when creating the action to signal a success in the events request', () => { - let tag: string + let tags: string[] let contracts: string[] beforeEach(() => { - tag = 'a tag' + tags = ['a tag'] contracts = ['0x1', '0x2'] }) it('should return an object representing the action', () => { - expect(fetchEventSuccess(tag, contracts)).toEqual({ + expect(fetchEventSuccess(tags, contracts)).toEqual({ type: FETCH_EVENT_SUCCESS, meta: undefined, - payload: { tag, contracts } + payload: { tags, contracts } }) }) }) diff --git a/webapp/src/modules/event/actions.ts b/webapp/src/modules/event/actions.ts index ddd73423c6..3b600bb7a0 100644 --- a/webapp/src/modules/event/actions.ts +++ b/webapp/src/modules/event/actions.ts @@ -4,10 +4,10 @@ export const FETCH_EVENT_REQUEST = '[Request] Fetch event' export const FETCH_EVENT_SUCCESS = '[Success] Fetch event' export const FETCH_EVENT_FAILURE = '[Failure] Fetch event' -export const fetchEventRequest = (tag: string) => - action(FETCH_EVENT_REQUEST, { tag }) -export const fetchEventSuccess = (tag: string, contracts: string[]) => - action(FETCH_EVENT_SUCCESS, { tag, contracts }) +export const fetchEventRequest = (tags: string[]) => + action(FETCH_EVENT_REQUEST, { tags }) +export const fetchEventSuccess = (tags: string[], contracts: string[]) => + action(FETCH_EVENT_SUCCESS, { tags, contracts }) export const fetchEventFailure = (error: string) => action(FETCH_EVENT_FAILURE, { error }) diff --git a/webapp/src/modules/event/reducer.spec.ts b/webapp/src/modules/event/reducer.spec.ts index 09eb28959e..29cb6ee0a6 100644 --- a/webapp/src/modules/event/reducer.spec.ts +++ b/webapp/src/modules/event/reducer.spec.ts @@ -55,8 +55,8 @@ failureActions.forEach(action => { }) describe('when reducing the successful action of fetching an event addresses by tag', () => { - const requestAction = fetchEventRequest(eventTag) - const successAction = fetchEventSuccess(eventTag, eventAddresses) + const requestAction = fetchEventRequest([eventTag]) + const successAction = fetchEventSuccess([eventTag], eventAddresses) const initialState = { ...INITIAL_STATE, diff --git a/webapp/src/modules/event/reducer.ts b/webapp/src/modules/event/reducer.ts index 898f65d201..94a15b1d06 100644 --- a/webapp/src/modules/event/reducer.ts +++ b/webapp/src/modules/event/reducer.ts @@ -39,14 +39,14 @@ export function eventReducer( loading: loadingReducer(state.loading, action) } case FETCH_EVENT_SUCCESS: - const { tag, contracts } = action.payload + const { tags, contracts } = action.payload return { ...state, loading: loadingReducer(state.loading, action), error: null, data: { ...state.data, - [tag]: contracts + [tags[0]]: contracts } } case FETCH_EVENT_FAILURE: diff --git a/webapp/src/modules/event/sagas.spec.ts b/webapp/src/modules/event/sagas.spec.ts index 55f917cc49..b2688d7ded 100644 --- a/webapp/src/modules/event/sagas.spec.ts +++ b/webapp/src/modules/event/sagas.spec.ts @@ -24,7 +24,7 @@ describe('when handling the fetch events request action', () => { ] ]) .put(fetchEventFailure(anError.message)) - .dispatch(fetchEventRequest(eventTag)) + .dispatch(fetchEventRequest([eventTag])) .run({ silenceTimeout: true }) }) }) @@ -38,8 +38,8 @@ describe('when handling the fetch events request action', () => { eventContracts ] ]) - .put(fetchEventSuccess(eventTag, eventContracts)) - .dispatch(fetchEventRequest(eventTag)) + .put(fetchEventSuccess([eventTag], eventContracts)) + .dispatch(fetchEventRequest([eventTag])) .run({ silenceTimeout: true }) }) }) diff --git a/webapp/src/modules/event/sagas.ts b/webapp/src/modules/event/sagas.ts index 712755253a..21fb0a662b 100644 --- a/webapp/src/modules/event/sagas.ts +++ b/webapp/src/modules/event/sagas.ts @@ -14,15 +14,15 @@ export function* eventSaga() { } export function* handleFetchEventRequest(action: FetchEventRequestAction) { - const { tag } = action.payload + const { tags } = action.payload try { const addresses: string[] = yield call( [builderAPI, builderAPI.fetchAddressesByTag], - [tag] + tags ) - yield put(fetchEventSuccess(tag, addresses)) + yield put(fetchEventSuccess(tags, addresses)) } catch (error) { yield put( fetchEventFailure(