@ludo.ninja/components 2.3.30 → 2.3.32

package/build/components/sidebar/index.js

@@ -112,7 +112,9 @@ const Sidebar = () => {
                 closeSidebar();
                 redirectToLoginWindow();
             },
-            logout: signOut,
+            logout: () => {
+                signOut(true);
+            },
         }, isAuthorized: isAuthorized, userWallets: wallets, slots: {
             menu: sideBarData.map(({ title, href, icon, isExternalUrl }) => ((0, jsx_runtime_1.jsxs)(SLink, { href: href, target: isExternalUrl ? "_blank" : "_self", onClick: closeSidebar, passHref: isExternalUrl, scale: (0, scale_1.getAdaptiveScale)({ windowDimensions, currentSize: 1 }), children: [(0, jsx_runtime_1.jsx)("span", { className: "icon-wrapper", children: icon }), title] }, title))),
             userPicture: ({ children, height, width, isNeedBoxTransform }) => ((0, jsx_runtime_1.jsx)(Userpic_1.default, { width: width, height: height, userId: userId, isNeedBoxTransform: isNeedBoxTransform, children: children })),

package/build/components/sidebar/sidebarSpa.js

@@ -111,7 +111,9 @@ const SidebarSpa = ({ SLink, UserPic, SidebarInviteCodeLabel, }) => {
                 closeSidebar();
                 redirectToLoginWindow();
             },
-            logout: signOut,
+            logout: () => {
+                signOut(true);
+            },
         }, isAuthorized: isAuthorized, userWallets: wallets, slots: {
             menu: sideBarData.map(({ title, href, icon, isExternalUrl }) => ((0, jsx_runtime_1.jsxs)(SLink, { href: href, target: isExternalUrl ? "_blank" : "_self", onClick: closeSidebar, passHref: isExternalUrl, scale: (0, scale_1.getAdaptiveScale)({ windowDimensions, currentSize: 1 }), children: [(0, jsx_runtime_1.jsx)("span", { className: "icon-wrapper", children: icon }), title] }, title))),
             userPicture: ({ children, height, width, isNeedBoxTransform }) => ((0, jsx_runtime_1.jsx)(UserPic, { width: width, height: height, userId: userId, isNeedBoxTransform: isNeedBoxTransform, children: children })),

package/build/modules/opportunity/OpportunityCard.js

@@ -21,11 +21,13 @@ const ScreenWidth_1 = require("../../styles/ScreenWidth");
 const colors_1 = require("../../styles/colors");
 const boxTransform_1 = __importDefault(require("../../styles/mixins/boxTransform"));
 const typography_1 = require("../../styles/typography");
+const MainButton_1 = __importDefault(require("../../system/Buttons/MainButton"));
 const CardCategory_1 = __importDefault(require("../../system/Cards/CardContent/CardCategory"));
 const Headicons_1 = __importDefault(require("../../system/Cards/Styles/Headicons"));
 const ImageInterceptor_1 = require("../../system/Img/ImageInterceptor");
 const index_1 = require("../../system/index");
 const screen_1 = require("../../utils/screen");
+const schema_1 = require("@ludo.ninja/api/build/graphql_tools/__generated__/opportunitiesHost/schema");
 const ludoDomains_1 = require("@ludo.ninja/core/build/ludoDomains");
 const colors_2 = require("@ludo.ninja/ui/build/styles/colors");
 const boxShadow_1 = __importDefault(require("@ludo.ninja/ui/build/styles/mixins/boxShadow"));
@@ -144,6 +146,7 @@ const StyledCardContent = styled_components_1.default.div `
         display: inline-flex;
         justify-content: space-between;
         flex-wrap: wrap;
+
         .participantsCount {
           color: ${colors_1.TextGrayColor};
           ${typography_1.FH6}
@@ -249,18 +252,21 @@ const OpportunityCard = ({ opportunity, toolsForRemove, }) => {
     const getMediaENVDomain = (0, env_1.useEnvStore)((state) => state.getMediaDomain);
     const isProd = (0, env_1.useEnvStore)((state) => state.isProd);
     const opportunityLink = opportunity.opportunityType === "TOKEN_AIRDROP"
-        // ? `${ludoDomains[NEXT_PUBLIC_ENV_VALUE as TEnvValue]["app"]}/brand/${opportunity.opportunityId}`
-        ? `${ludoDomains_1.ludoDomains[NEXT_PUBLIC_ENV_VALUE]["welcome"]}/${opportunity.projectSlug === 'tico' ? 'funtico' : opportunity.projectSlug}` || ''
+        ? // ? `${ludoDomains[NEXT_PUBLIC_ENV_VALUE as TEnvValue]["app"]}/brand/${opportunity.opportunityId}`
+            `${ludoDomains_1.ludoDomains[NEXT_PUBLIC_ENV_VALUE]["welcome"]}/${opportunity.projectSlug === "tico" ? "funtico" : opportunity.projectSlug}` || ""
         : opportunity.projectUrl || opportunity.shareLink || "";
-    const isShowParticipantsCount = typeof opportunity.availablePlacesForAirdrop === 'number' && typeof opportunity.participantsLimit === 'number';
-    const sanitizedHtml = (0, sanitize_html_1.default)(opportunity?.description || '', {
-        allowedTags: ['b', 'i', 'em', 'strong', 'br', 'div'],
+    const isShowParticipantsCount = typeof opportunity.availablePlacesForAirdrop === "number" && typeof opportunity.participantsLimit === "number";
+    const isAirdrop = opportunity.opportunityType === schema_1.IOpportunityType.TokenAirdrop;
+    const sanitizedHtml = (0, sanitize_html_1.default)(opportunity?.description || "", {
+        allowedTags: ["b", "i", "em", "strong", "br", "div"],
     });
     return ((0, jsx_runtime_1.jsxs)(SWrapperLink, { href: opportunityLink, target: "_blank", onClick: () => openOpportunityAction({ opportunityId: opportunity.opportunityId }), children: [(0, jsx_runtime_1.jsxs)(StyledCardHead, { children: [(0, jsx_runtime_1.jsx)(OpportunityImage, { alt: opportunity.name, src: opportunity.media ? `${getMediaENVDomain()}/opportunity-medias/${opportunity.media}` : "" }), (0, jsx_runtime_1.jsx)(Headicons_1.default, { isMobile: isMobile, onClick: (e) => {
                             e.stopPropagation();
                             e.preventDefault();
                         }, children: (0, jsx_runtime_1.jsxs)("div", { className: "icons", children: [(0, jsx_runtime_1.jsx)("div", { className: "icon", onClick: () => {
                                         openModalSidebarPortal((0, jsx_runtime_1.jsx)(OpportunityMenu_1.OpportunityMenu, { opportunity: opportunity, onClose: closeModalSidebarPortal }));
-                                    }, children: (0, jsx_runtime_1.jsx)(ShareIcon_1.ShareIcon, {}) }), !isProd() && ((0, jsx_runtime_1.jsx)(OpportunityLike, { isDefaultLiked: !!(isSignedIn && opportunity.liked), opportunityId: opportunity.opportunityId, toolsForRemove: toolsForRemove }))] }) })] }), (0, jsx_runtime_1.jsxs)(StyledCardContent, { children: [(0, jsx_runtime_1.jsxs)("div", { className: "cardContent", children: [(0, jsx_runtime_1.jsxs)("div", { className: "cardContentWrapper", children: [(0, jsx_runtime_1.jsx)("p", { className: `secondName`, children: opportunity.name }), (0, jsx_runtime_1.jsx)("p", { className: `mainName`, dangerouslySetInnerHTML: { __html: sanitizedHtml } }), (0, jsx_runtime_1.jsxs)("p", { className: `categoryName`, children: [opportunity.categoryName, isShowParticipantsCount && (0, jsx_runtime_1.jsx)("span", { className: 'participantsCount', children: `Free spots left: ${opportunity.availablePlacesForAirdrop}` })] })] }), (0, jsx_runtime_1.jsx)(OpportunityDropDown_1.OpportunityDropDown, { opportunity: opportunity })] }), (0, jsx_runtime_1.jsxs)(index_1.Flex, { alignItems: "end", justifyContent: "space-between", className: `categoryFooter`, children: [(0, jsx_runtime_1.jsx)(CardCategory_1.default, { label: data_1.default[opportunity.opportunityType] || data_1.default.opportunity }), opportunity.activeUntil && ((0, jsx_runtime_1.jsx)("div", { className: "date", children: `till ${(0, moment_1.default)(opportunity.activeUntil).format("LL")}` }))] })] })] }));
+                                    }, children: (0, jsx_runtime_1.jsx)(ShareIcon_1.ShareIcon, {}) }), !isProd() && ((0, jsx_runtime_1.jsx)(OpportunityLike, { isDefaultLiked: !!(isSignedIn && opportunity.liked), opportunityId: opportunity.opportunityId, toolsForRemove: toolsForRemove }))] }) })] }), (0, jsx_runtime_1.jsxs)(StyledCardContent, { children: [(0, jsx_runtime_1.jsxs)("div", { className: "cardContent", children: [(0, jsx_runtime_1.jsxs)("div", { className: "cardContentWrapper", children: [(0, jsx_runtime_1.jsx)("p", { className: `secondName`, children: opportunity.name }), (0, jsx_runtime_1.jsx)("p", { className: `mainName`, dangerouslySetInnerHTML: { __html: sanitizedHtml } }), (0, jsx_runtime_1.jsx)("p", { className: `categoryName`, children: opportunity.categoryName })] }), (0, jsx_runtime_1.jsx)(OpportunityDropDown_1.OpportunityDropDown, { opportunity: opportunity })] }), (0, jsx_runtime_1.jsxs)(index_1.Flex, { alignItems: "end", justifyContent: "space-between", className: `categoryFooter`, children: [(0, jsx_runtime_1.jsx)(CardCategory_1.default, { label: data_1.default[opportunity.opportunityType] || data_1.default.opportunity }), isAirdrop && !opportunity.subscribed ? ((0, jsx_runtime_1.jsx)(MainButton_1.default, { style: { borderRadius: "6px" }, variant: "primaryXS", text: "Claim", onClick: () => {
+                                    window.location.replace(opportunityLink);
+                                } })) : (opportunity.activeUntil && ((0, jsx_runtime_1.jsx)("div", { className: "date", children: `till ${(0, moment_1.default)(opportunity.activeUntil).format("LL")}` })))] })] })] }));
 };
 exports.OpportunityCard = OpportunityCard;

package/build/modules/opportunity/type.d.ts

@@ -1,2 +1,2 @@
 import { opportunitiesSchema } from '@ludo.ninja/api';
-export type TOpportunity = Pick<opportunitiesSchema.IOpportunityV2, 'opportunityId' | 'projectId' | 'categoryId' | 'opportunityStatus' | 'opportunityType' | 'notificationType' | 'name' | 'description' | 'projectBlockchain' | 'projectContract' | 'projectName' | 'projectSlug' | 'categoryName' | 'ludoUrl' | 'projectUrl' | 'activeFrom' | 'activeUntil' | 'minXpLevel' | 'maxXpLevel' | 'minRank' | 'maxRank' | 'media' | 'reportLink' | 'clicks' | 'views' | 'blockchain' | 'collection' | 'createdAt' | 'minWalletValue' | 'maxWalletValue' | 'shareLink' | 'liked' | 'participantsLimit' | 'availablePlacesForAirdrop'>;
+export type TOpportunity = Pick<opportunitiesSchema.IOpportunityV2, 'opportunityId' | 'projectId' | 'categoryId' | 'opportunityStatus' | 'opportunityType' | 'notificationType' | 'name' | 'description' | 'projectBlockchain' | 'projectContract' | 'projectName' | 'projectSlug' | 'categoryName' | 'ludoUrl' | 'projectUrl' | 'activeFrom' | 'activeUntil' | 'minXpLevel' | 'maxXpLevel' | 'minRank' | 'maxRank' | 'media' | 'reportLink' | 'clicks' | 'views' | 'blockchain' | 'collection' | 'createdAt' | 'minWalletValue' | 'maxWalletValue' | 'shareLink' | 'liked' | 'participantsLimit' | 'availablePlacesForAirdrop' | 'subscribed'>;

package/build/modules/user/auth/useSignOut.js

@@ -33,7 +33,7 @@ const useSignOut = () => {
             setUser(null);
             // when invite code is not required = no redirect
             // window.location.replace(ludoDomains[NEXT_PUBLIC_ENV_VALUE as TEnvValue]["welcome"]);
-            if (includeRedirect && window.location.origin === ludoDomains_1.ludoDomains[NEXT_PUBLIC_ENV_VALUE]["account"]) {
+            if (includeRedirect) {
                 window.location.replace(ludoDomains_1.ludoDomains[NEXT_PUBLIC_ENV_VALUE]["welcome"]);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ludo.ninja/components",
-  "version": "2.3.30",
+  "version": "2.3.32",
   "private": false,
   "main": "build/index.js",
   "types": "build/index.d.ts",