From 82f2eea610f70300b38ed565b7e8ab7d2d72ddd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=92scar=20Casajuana?= Date: Fri, 9 Aug 2024 14:01:13 +0200 Subject: [PATCH] Upgrade envelope to use list, as in latest changes --- src/components/Envelope/Detail.tsx | 13 ++++++------ src/theme/components/Envelope.ts | 6 ++---- yarn.lock | 34 +++--------------------------- 3 files changed, 11 insertions(+), 42 deletions(-) diff --git a/src/components/Envelope/Detail.tsx b/src/components/Envelope/Detail.tsx index 2f0e6f0..531f691 100644 --- a/src/components/Envelope/Detail.tsx +++ b/src/components/Envelope/Detail.tsx @@ -1,17 +1,17 @@ -import voteImage from '/images/vocdoni-vote.png' import { Flex, Image, Link, Tab, TabList, TabPanel, TabPanels, Text } from '@chakra-ui/react' +import { Envelope, VotePackageType } from '@vocdoni/chakra-components' +import { ElectionProvider, useElection } from '@vocdoni/react-providers' import { PublishedElection, VoteInfoResponse } from '@vocdoni/sdk' import { formatDistance } from 'date-fns' import { Trans, useTranslation } from 'react-i18next' import { generatePath, Link as RouterLink } from 'react-router-dom' import { CopyButton, ReducedTextAndCopy } from '~components/Layout/CopyButton' -import { RawContentBox } from '~components/Layout/ShowRawButton' -import { RoutePath } from '~constants' -import { RouteParamsTabs } from '~components/Layout/RouteParamsTabs' import { DetailsGrid, GridItemProps } from '~components/Layout/DetailsGrid' +import { RouteParamsTabs } from '~components/Layout/RouteParamsTabs' +import { RawContentBox } from '~components/Layout/ShowRawButton' import { processIdGridItem } from '~components/Transactions/TxDetails/SpecificTxDetails' -import { Envelope, VotePackageType } from '@vocdoni/chakra-components' -import { ElectionProvider, useElection } from '@vocdoni/react-providers' +import { RoutePath } from '~constants' +import voteImage from '/images/vocdoni-vote.png' /** * Show envelope content @@ -78,7 +78,6 @@ const EnvelopeDetail = ({ } export const VotePackage = ({ votePackage }: { votePackage: VotePackageType }) => { - const { t } = useTranslation() const { election } = useElection() if (!election || !(election instanceof PublishedElection)) return null diff --git a/src/theme/components/Envelope.ts b/src/theme/components/Envelope.ts index 5850bb2..50fe640 100644 --- a/src/theme/components/Envelope.ts +++ b/src/theme/components/Envelope.ts @@ -11,10 +11,8 @@ const Envelope = defineMultiStyleConfig({ fontSize: 'lg', }, choiceTitle: { - _before: { - content: '"-"', - pr: 1, - }, + listStyle: 'disc', + ml: 4, }, }), }) diff --git a/yarn.lock b/yarn.lock index 816d22d..28a0784 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1963,9 +1963,9 @@ react-refresh "^0.14.0" "@vocdoni/chakra-components@~0.8.1": - version "0.8.8" - resolved "https://registry.yarnpkg.com/@vocdoni/chakra-components/-/chakra-components-0.8.8.tgz#8af3a84886ff09a38bf78f42901b58015ecf5a07" - integrity sha512-xkI8mErw2OYuNbfxNEVUX/Udh8e+uf1J8vgWv+V7PAoQsdNAWme8BSbabyg/U9ubXL9mvPzvDnmGZkaE85qUgQ== + version "0.8.9" + resolved "https://registry.yarnpkg.com/@vocdoni/chakra-components/-/chakra-components-0.8.9.tgz#d2cea8b6c3c40f8e24a0e8d9f22df7446f154521" + integrity sha512-jfmOmqpb/qCzcMSG/MJaxJAZDycnBOZxi4aC2SsBnpWbl8GvZgb5XrzSF7LKnKct3NWSzlyeUDNrJUtDcJhRkA== dependencies: "@vocdoni/react-providers" "~0.4.4" @@ -1987,34 +1987,6 @@ resolved "https://registry.yarnpkg.com/@vocdoni/react-providers/-/react-providers-0.4.7.tgz#f4ebfc2d237cf864d3c050d186fe919761a23d5f" integrity sha512-jTbfyM6KGmhjXMlUQzz+sn2m1cNZJdpADvPA456BA5YPb6CfeLgLzlnxeeeTAVPEnVMuovIQmejuMxvVEfLe4g== -"@vocdoni/sdk@https://github.com/vocdoni/vocdoni-sdk.git#f/new_pagination": - version "0.8.3" - resolved "https://github.com/vocdoni/vocdoni-sdk.git#7208bf999699d1cdf6fff188af03c2fab622182f" - dependencies: - "@ethersproject/abstract-signer" "^5.7.0" - "@ethersproject/address" "^5.7.0" - "@ethersproject/bignumber" "^5.7.0" - "@ethersproject/bytes" "^5.7.0" - "@ethersproject/keccak256" "^5.7.0" - "@ethersproject/providers" "^5.7.1" - "@ethersproject/signing-key" "^5.7.0" - "@ethersproject/strings" "^5.7.0" - "@ethersproject/units" "^5.7.0" - "@ethersproject/wallet" "^5.7.0" - "@size-limit/file" "^8.2.4" - "@vocdoni/proto" "1.15.8" - axios "0.28.1" - blake2b "^2.1.4" - iso-language-codes "^1.1.0" - js-sha256 "^0.10.1" - readable-stream "^4.4.2" - tiny-invariant "^1.3.1" - tweetnacl "^1.0.3" - wasmbuilder "^0.0.16" - wasmcurves "0.2.1" - web-worker "^1.2.0" - yup "^0.32.11" - "@vocdoni/sdk@https://github.com/vocdoni/vocdoni-sdk.git#main": version "0.8.3" resolved "https://github.com/vocdoni/vocdoni-sdk.git#ef8eebceabb8466129f955c031c0cc00a8dcbb9b"