From b1e4c0e4d79832121c7bd1b250069f72350f20bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=2EJ=2E=20=E2=80=9Cdysbulic=E2=80=9D=20H?= Date: Fri, 7 Oct 2022 18:12:16 -0400 Subject: [PATCH] =?UTF-8?q?making=20needed=20pSEED=20configurable=20?= =?UTF-8?q?=F0=9F=9A=B5=F0=9F=8F=BF=E2=80=8D=E2=99=80=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actions/quests/createQuest/permissions.ts | 4 +- packages/design-system/src/index.ts | 3 + packages/utils/src/constants.ts | 2 + .../web/components/Quest/QuestDetails.tsx | 3 +- packages/web/components/Quest/QuestForm.tsx | 4 +- packages/web/pages/quest/[id].tsx | 4 +- packages/web/pages/quests.tsx | 6 +- packages/web/utils/questHelpers.ts | 8 +- yarn.lock | 769 +++++++++++++++++- 9 files changed, 785 insertions(+), 18 deletions(-) diff --git a/packages/backend/src/handlers/actions/quests/createQuest/permissions.ts b/packages/backend/src/handlers/actions/quests/createQuest/permissions.ts index d6addf43..9a1c0f14 100644 --- a/packages/backend/src/handlers/actions/quests/createQuest/permissions.ts +++ b/packages/backend/src/handlers/actions/quests/createQuest/permissions.ts @@ -17,13 +17,13 @@ export async function isAllowedToCreateQuest( ); const pSEEDBalance = await pSEEDContract.balanceOf(playerAddress); const pSEEDDecimals = await pSEEDContract.decimals(); - const minimumPooledSeedBalance = new BN(100); + const minimumPooledSeedBalance = new BN(Constants.PSEED_FOR_QUEST); const pSEEDBalanceInDecimal = amountToDecimal( pSEEDBalance.toString(), pSEEDDecimals, ); - const allowed = new BN(pSEEDBalanceInDecimal).gt(minimumPooledSeedBalance); + const allowed = new BN(pSEEDBalanceInDecimal).gte(minimumPooledSeedBalance); return allowed; } diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.ts index f3919f22..43f64802 100644 --- a/packages/design-system/src/index.ts +++ b/packages/design-system/src/index.ts @@ -82,6 +82,7 @@ export { ChakraProps, ChakraProvider, CloseButton, + Code, Collapse, ComponentWithAs, Container, @@ -161,12 +162,14 @@ export { StatNumber, Switch, Tab, + Table, TabList, TabPanel, TabPanels, Tabs, Text, Textarea, + Th, Tooltip, UnorderedList, useBoolean, diff --git a/packages/utils/src/constants.ts b/packages/utils/src/constants.ts index d76017f2..c2bdec3a 100644 --- a/packages/utils/src/constants.ts +++ b/packages/utils/src/constants.ts @@ -22,3 +22,5 @@ export const IPFS_LINK_PATTERN = 'https://{v1cid}.ipfs.dweb.link/{path}'; export const PSEED_ADDRESS = '0x8a8fcd351ed553fc75aecbc566a32f94471f302e'; + +export const PSEED_FOR_QUEST = 0; diff --git a/packages/web/components/Quest/QuestDetails.tsx b/packages/web/components/Quest/QuestDetails.tsx index 0960cc63..37ffab23 100644 --- a/packages/web/components/Quest/QuestDetails.tsx +++ b/packages/web/components/Quest/QuestDetails.tsx @@ -24,7 +24,6 @@ import { QuestWithCompletionFragment, Skill, } from 'graphql/autogen/types'; -import parse from 'html-react-parser'; import { useUser } from 'lib/hooks'; import moment from 'moment'; import { optimizedImage } from 'utils/imageHelpers'; @@ -96,7 +95,7 @@ export const QuestDetails: React.FC = ({ quest }) => { DESCRIPTION - {parse(quest.description || '')} + {quest.description ?? ''} {quest.repetition === QuestRepetition_Enum.Recurring && ( diff --git a/packages/web/components/Quest/QuestForm.tsx b/packages/web/components/Quest/QuestForm.tsx index 119e6f1b..b311d695 100644 --- a/packages/web/components/Quest/QuestForm.tsx +++ b/packages/web/components/Quest/QuestForm.tsx @@ -8,13 +8,13 @@ import { MetaTag, Select, Text, + Textarea, VStack, } from '@metafam/ds'; import { FlexContainer } from 'components/Container'; import { RepetitionColors } from 'components/Quest/QuestTags'; import { RolesSelect } from 'components/Quest/Roles'; import { SkillsSelect } from 'components/Quest/Skills'; -import { WYSIWYGEditor } from 'components/Quest/WYSIWYGEditor'; import { GuildFragment, PlayerRole, @@ -208,7 +208,7 @@ export const QuestForm: React.FC = ({ }} defaultValue={defaultValues.description} render={({ field: { onChange, value } }) => ( - +