decentraland-dapps 23.24.0 → 23.25.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/containers/Banner/Banner.container.d.ts +1 -1
- package/dist/containers/Banner/Banner.container.js +1 -1
- package/dist/containers/Banner/Banner.container.js.map +1 -1
- package/dist/containers/Banner/Banner.d.ts +3 -0
- package/dist/containers/Banner/Banner.js +24 -0
- package/dist/containers/Banner/Banner.js.map +1 -0
- package/dist/containers/Banner/Banner.types.d.ts +7 -2
- package/dist/lib/time.d.ts +1 -0
- package/dist/lib/time.js +5 -0
- package/dist/lib/time.js.map +1 -1
- package/dist/modules/campaign/actions.d.ts +6 -2
- package/dist/modules/campaign/actions.js.map +1 -1
- package/dist/modules/campaign/sagas.js +4 -1
- package/dist/modules/campaign/sagas.js.map +1 -1
- package/dist/modules/campaign/selectors.d.ts +3 -1
- package/dist/modules/campaign/selectors.js +8 -4
- package/dist/modules/campaign/selectors.js.map +1 -1
- package/dist/modules/campaign/types.d.ts +3 -1
- package/package.json +2 -2
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { OwnProps } from './Banner.types';
|
|
3
|
-
declare const _default: import("react-redux").ConnectedComponent<import("react").FC<import("
|
|
3
|
+
declare const _default: import("react-redux").ConnectedComponent<import("react").FC<import("./Banner.types").BannerProps>, import("react-redux").Omit<import("./Banner.types").BannerProps, "error" | "isLoading" | "fields" | "assets"> & OwnProps>;
|
|
4
4
|
export default _default;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { connect } from 'react-redux';
|
|
2
|
-
import { Banner } from 'decentraland-ui2';
|
|
3
2
|
import { getBanner, getBannerAssets, getError, isLoading } from '../../modules/campaign';
|
|
3
|
+
import { Banner } from './Banner';
|
|
4
4
|
const mapState = (state, ownProps) => ({
|
|
5
5
|
fields: getBanner(state, ownProps.id) ?? null,
|
|
6
6
|
assets: getBannerAssets(state, ownProps.id),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Banner.container.js","sourceRoot":"","sources":["../../../src/containers/Banner/Banner.container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"Banner.container.js","sourceRoot":"","sources":["../../../src/containers/Banner/Banner.container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACrC,OAAO,EACL,SAAS,EACT,eAAe,EACf,QAAQ,EACR,SAAS,EACV,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjC,MAAM,QAAQ,GAAG,CAAC,KAAU,EAAE,QAAkB,EAAiB,EAAE,CAAC,CAAC;IACnE,MAAM,EAAE,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC,IAAI,IAAI;IAC7C,MAAM,EAAE,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC;IAC3C,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC;IAC3B,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;CACvB,CAAC,CAAA;AAEF,eAAe,OAAO,CAA8B,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAA"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import React, { useCallback } from 'react';
|
|
2
|
+
import { Banner as BannerComponent } from 'decentraland-ui2';
|
|
3
|
+
import { getAnalytics } from '../../modules/analytics/utils';
|
|
4
|
+
import { sleep } from '../../lib/time';
|
|
5
|
+
export const Banner = (props) => {
|
|
6
|
+
const { fields, id, ...rest } = props;
|
|
7
|
+
const handleClick = useCallback((event) => {
|
|
8
|
+
const anchorEvent = event;
|
|
9
|
+
anchorEvent.preventDefault();
|
|
10
|
+
const analytics = getAnalytics();
|
|
11
|
+
if (analytics) {
|
|
12
|
+
analytics.track('CLICK_BANNER', {
|
|
13
|
+
id: fields?.id,
|
|
14
|
+
location: id
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
// Delay the navigation to allow the analytics to be tracked
|
|
18
|
+
sleep(300).then(() => {
|
|
19
|
+
window.location.href = anchorEvent.target.href;
|
|
20
|
+
});
|
|
21
|
+
}, [fields?.id, id]);
|
|
22
|
+
return React.createElement(BannerComponent, { onClick: handleClick, fields: fields, ...rest });
|
|
23
|
+
};
|
|
24
|
+
//# sourceMappingURL=Banner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Banner.js","sourceRoot":"","sources":["../../../src/containers/Banner/Banner.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAE,MAAM,IAAI,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAE5D,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAEtC,MAAM,CAAC,MAAM,MAAM,GAA0B,CAAC,KAAkB,EAAE,EAAE;IAClE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAA;IACrC,MAAM,WAAW,GAAG,WAAW,CAC7B,CAAC,KAA0C,EAAE,EAAE;QAC7C,MAAM,WAAW,GAAI,KAEpB,CAAA;QACD,WAAW,CAAC,cAAc,EAAE,CAAA;QAE5B,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;QAChC,IAAI,SAAS,EAAE,CAAC;YACd,SAAS,CAAC,KAAK,CAAC,cAAc,EAAE;gBAC9B,EAAE,EAAE,MAAM,EAAE,EAAE;gBACd,QAAQ,EAAE,EAAE;aACb,CAAC,CAAA;QACJ,CAAC;QACD,4DAA4D;QAC5D,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACnB,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAI,WAAW,CAAC,MAA4B,CAAC,IAAI,CAAA;QACvE,CAAC,CAAC,CAAA;IACJ,CAAC,EACD,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CACjB,CAAA;IAED,OAAO,oBAAC,eAAe,IAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,KAAM,IAAI,GAAI,CAAA;AAC5E,CAAC,CAAA"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import { BannerFields } from '@dcl/schemas';
|
|
2
|
+
import { BannerProps as UIBannerProps } from 'decentraland-ui2';
|
|
3
|
+
export type BannerProps = Omit<UIBannerProps, 'fields'> & {
|
|
4
|
+
fields: (BannerFields & {
|
|
5
|
+
id: string;
|
|
6
|
+
}) | null;
|
|
7
|
+
} & {
|
|
3
8
|
id: string;
|
|
4
9
|
};
|
|
5
10
|
export type OwnProps = Pick<BannerProps, 'id'>;
|
package/dist/lib/time.d.ts
CHANGED
package/dist/lib/time.js
CHANGED
package/dist/lib/time.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../src/lib/time.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,yBAAyB,CAAC,kBAA0B;IAClE,OAAO,IAAI,CAAC,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAA;AAC9C,CAAC"}
|
|
1
|
+
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../src/lib/time.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,yBAAyB,CAAC,kBAA0B;IAClE,OAAO,IAAI,CAAC,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAA;AAC9C,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,KAAa;IACjC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAC5B,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -3,12 +3,16 @@ export declare const FETCH_CAMPAIGN_REQUEST = "[Request] Fetch Campaign";
|
|
|
3
3
|
export declare const FETCH_CAMPAIGN_SUCCESS = "[Success] Fetch Campaign";
|
|
4
4
|
export declare const FETCH_CAMPAIGN_FAILURE = "[Failure] Fetch Campaign";
|
|
5
5
|
export declare const fetchCampaignRequest: () => import("typesafe-actions/dist/types").EmptyAction<"[Request] Fetch Campaign">;
|
|
6
|
-
export declare const fetchCampaignSuccess: (banners: Record<string, BannerFields
|
|
6
|
+
export declare const fetchCampaignSuccess: (banners: Record<string, BannerFields & {
|
|
7
|
+
id: string;
|
|
8
|
+
}>, assets: Record<string, ContentfulAsset>, name?: LocalizedField<string>, tabName?: LocalizedField<string>, mainTag?: string, additionalTags?: string[]) => import("typesafe-actions/dist/types").PayloadAction<"[Success] Fetch Campaign", {
|
|
7
9
|
name: LocalizedField<string> | undefined;
|
|
8
10
|
tabName: LocalizedField<string> | undefined;
|
|
9
11
|
mainTag: string | undefined;
|
|
10
12
|
additionalTags: string[] | undefined;
|
|
11
|
-
banners: Record<string, BannerFields
|
|
13
|
+
banners: Record<string, BannerFields & {
|
|
14
|
+
id: string;
|
|
15
|
+
}>;
|
|
12
16
|
assets: Record<string, ContentfulAsset>;
|
|
13
17
|
}>;
|
|
14
18
|
export declare const fetchCampaignFailure: (error: string) => import("typesafe-actions/dist/types").PayloadAction<"[Failure] Fetch Campaign", {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../src/modules/campaign/actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAGzC,MAAM,CAAC,MAAM,sBAAsB,GAAG,0BAA0B,CAAA;AAChE,MAAM,CAAC,MAAM,sBAAsB,GAAG,0BAA0B,CAAA;AAChE,MAAM,CAAC,MAAM,sBAAsB,GAAG,0BAA0B,CAAA;AAEhE,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAA;AAExE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,
|
|
1
|
+
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../src/modules/campaign/actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAGzC,MAAM,CAAC,MAAM,sBAAsB,GAAG,0BAA0B,CAAA;AAChE,MAAM,CAAC,MAAM,sBAAsB,GAAG,0BAA0B,CAAA;AAChE,MAAM,CAAC,MAAM,sBAAsB,GAAG,0BAA0B,CAAA;AAEhE,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAA;AAExE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,OAAsD,EACtD,MAAuC,EACvC,IAA6B,EAC7B,OAAgC,EAChC,OAAgB,EAChB,cAAyB,EACzB,EAAE,CACF,MAAM,CAAC,sBAAsB,EAAE;IAC7B,IAAI;IACJ,OAAO;IACP,OAAO;IACP,cAAc;IACd,OAAO;IACP,MAAM;CACP,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAa,EAAE,EAAE,CACpD,MAAM,CAAC,sBAAsB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA"}
|
|
@@ -29,7 +29,10 @@ export function* campaignSagas(client, config) {
|
|
|
29
29
|
const bannerEntry = entries[linkedEntryId];
|
|
30
30
|
if (bannerEntry &&
|
|
31
31
|
bannerEntry.sys.contentType.sys.id === BANNER_CONTENT_TYPE) {
|
|
32
|
-
acc[key] =
|
|
32
|
+
acc[key] = {
|
|
33
|
+
...bannerEntry.fields,
|
|
34
|
+
id: linkedEntryId
|
|
35
|
+
};
|
|
33
36
|
}
|
|
34
37
|
}
|
|
35
38
|
return acc;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/campaign/sagas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,EAML,gBAAgB,EAKhB,SAAS,EACV,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,EAAE,sBAAsB,EAA8B,MAAM,WAAW,CAAA;AAC9E,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAGtE,MAAM,kBAAkB,GAAG,OAAO,CAAA;AAClC,MAAM,mBAAmB,GAAG,QAAQ,CAAA;AACpC,MAAM,+BAA+B,GAAG,mBAAmB,CAAA;AAE3D,MAAM,SAAS,CAAC,CAAC,aAAa,CAC5B,MAAwB,EACxB,MAKC;IAED,MAAM,SAAS,CAAC,sBAAsB,EAAE,0BAA0B,CAAC,CAAA;IAEnE,QAAQ,CAAC,CAAC,0BAA0B,CAAC,CAA6B;QAChE,IAAI,CAAC;YACH,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,IAAI,CACrC,CAAC,MAAM,EAAE,YAAY,CAAC,EACtB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,EAAE,EACT,kBAAkB,EAClB,MAAM,CAAC,KAAK,CACb,CAA6C,CAAA;YAE9C,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;gBAC5C,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;YAClD,CAAC;YAED,MAAM,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAC1D,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAA;gBACzB,OAAO,GAAG,CAAA;YACZ,CAAC,EAAE,EAAqC,CAAC,CAAA;YAEzC,MAAM,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAC3D,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAA;gBACzB,OAAO,GAAG,CAAA;YACZ,CAAC,EAAE,EAAsD,CAAC,CAAA;YAE1D,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CACpD,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBACpB,MAAM,aAAa,GAAG,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;gBAClD,IAAI,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC7B,MAAM,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,EAAE,CAAA;oBAC1C,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;oBAC1C,IACE,WAAW;wBACX,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,mBAAmB,EAC1D,CAAC;wBACD,GAAG,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/campaign/sagas.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,8 @@ export declare const getAdditionalTags: (state: any) => string[];
|
|
|
12
12
|
export declare const getAllTags: (state: any) => string[];
|
|
13
13
|
export declare const getAssets: (state: any) => Record<string, ContentfulAsset> | null;
|
|
14
14
|
export declare const getTabName: (state: any) => LocalizedField<string> | null;
|
|
15
|
-
export declare const getBanner: (state: any, id: string) => BannerFields
|
|
15
|
+
export declare const getBanner: (state: any, id: string) => (BannerFields & {
|
|
16
|
+
id: string;
|
|
17
|
+
}) | null;
|
|
16
18
|
export declare const getBannerAssets: (state: any, bannerId: string) => Record<string, ContentfulAsset>;
|
|
17
19
|
export declare const getContentfulNormalizedLocale: (state: any) => ContentfulLocale;
|
|
@@ -2,6 +2,7 @@ import { ContentfulLocale, isSysLink } from '@dcl/schemas';
|
|
|
2
2
|
import { getLocale } from '../translation';
|
|
3
3
|
import { isLoadingType } from '../loading';
|
|
4
4
|
import { FETCH_CAMPAIGN_REQUEST } from './actions';
|
|
5
|
+
const isLocalizedField = (value) => typeof value === 'object' && value !== null && 'en-US' in value;
|
|
5
6
|
export const getState = (state) => state.campaign;
|
|
6
7
|
export const getData = (state) => getState(state).data;
|
|
7
8
|
export const getLoading = (state) => getState(state).loading;
|
|
@@ -26,10 +27,13 @@ export const getBannerAssets = (state, bannerId) => {
|
|
|
26
27
|
if (!banner)
|
|
27
28
|
return {};
|
|
28
29
|
return Object.entries(banner).reduce((acc, [_, value]) => {
|
|
29
|
-
if (
|
|
30
|
-
const
|
|
31
|
-
if (
|
|
32
|
-
|
|
30
|
+
if (isLocalizedField(value)) {
|
|
31
|
+
const usLocalizedValue = value['en-US'];
|
|
32
|
+
if (isSysLink(usLocalizedValue)) {
|
|
33
|
+
const asset = assets?.[usLocalizedValue.sys.id];
|
|
34
|
+
if (asset) {
|
|
35
|
+
acc[usLocalizedValue.sys.id] = asset;
|
|
36
|
+
}
|
|
33
37
|
}
|
|
34
38
|
}
|
|
35
39
|
return acc;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../../src/modules/campaign/selectors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,gBAAgB,EAAkB,SAAS,EAAE,MAAM,cAAc,CAAA;AACzG,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAqB,MAAM,YAAY,CAAA;AAE7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAU,EAAiB,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAA;AACrE,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAU,EAAgC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAA;AACzF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAU,EAAgB,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAA;AAC/E,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAU,EAAiB,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,CAAA;AAC5E,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAU,EAAW,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,sBAAsB,CAAC,CAAA;AAC1G,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAU,EAAsB,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,CAAA;AACrF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAU,EAAiC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,IAAI,IAAI,IAAI,CAAA;AAC1G,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAAU,EAAY,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,cAAc,IAAI,EAAE,CAAA;AAC/F,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAU,EAAY,EAAE;IACjD,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;IACjC,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAA;IAC/C,OAAO,CAAC,OAAO,EAAE,GAAG,cAAc,CAAC,CAAC,MAAM,CAAC,OAAO,CAAa,CAAA;AACjE,CAAC,CAAA;AACD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAU,EAA0C,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,IAAI,CAAA;AAC/G,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAU,EAAiC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,IAAI,IAAI,CAAA;AACxG,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAU,EAAE,EAAU,
|
|
1
|
+
{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../../src/modules/campaign/selectors.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,9 @@ export type CampaignState = {
|
|
|
8
8
|
tabName?: LocalizedField<string>;
|
|
9
9
|
mainTag?: string;
|
|
10
10
|
additionalTags?: string[];
|
|
11
|
-
banners: Record<string, BannerFields
|
|
11
|
+
banners: Record<string, BannerFields & {
|
|
12
|
+
id: string;
|
|
13
|
+
}>;
|
|
12
14
|
assets: Record<string, ContentfulAsset>;
|
|
13
15
|
} | null;
|
|
14
16
|
loading: LoadingState;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "decentraland-dapps",
|
|
3
|
-
"version": "23.
|
|
3
|
+
"version": "23.25.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"files": [
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"decentraland-crypto-fetch": "^2.0.1",
|
|
26
26
|
"decentraland-transactions": "^2.18.0",
|
|
27
27
|
"decentraland-ui": "^6.11.0",
|
|
28
|
-
"decentraland-ui2": "^0.
|
|
28
|
+
"decentraland-ui2": "^0.10.0",
|
|
29
29
|
"ethers": "^5.6.8",
|
|
30
30
|
"events": "^3.3.0",
|
|
31
31
|
"flat": "^5.0.2",
|