Fix styles

vocdoni · Oct 10, 2024 · cd4930e · cd4930e
1 parent b0ab79d
commit cd4930e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 35 deletions.
diff --git a/src/components/Process/Chained.tsx b/src/components/Process/Chained.tsx
@@ -9,7 +9,7 @@ import { VoteButton } from '~components/Process/Aside'
 import BlindCSPConnect from '~components/Process/BlindCSPConnect'
 import { ChainedProvider, useChainedProcesses } from './ChainedContext'
 import { ConfirmVoteModal } from './ConfirmVoteModal'
-import { MultiElectionQuestionsForm, MultiElectionVoteButton } from '~components/Process/MultiElectionQuestions'
+import { MultiElectionQuestionsForm } from '~components/Process/MultiElectionQuestions'
 import { MultiElectionsProvider } from '~components/Process/MultiElectionContext'
 
 type ChainedProcessesInnerProps = {

diff --git a/src/components/Process/MultiElectionConfirmation.tsx b/src/components/Process/MultiElectionConfirmation.tsx
@@ -3,7 +3,7 @@ import { Box, Text } from '@chakra-ui/layout'
 import { ModalBody, ModalCloseButton, ModalFooter, ModalHeader } from '@chakra-ui/modal'
 import { chakra, omitThemingProps, useMultiStyleConfig } from '@chakra-ui/system'
 import { useClient } from '@vocdoni/react-providers'
-import { ElectionResultsTypeNames, PublishedElection } from '@vocdoni/sdk'
+import { ElectionResultsTypeNames } from '@vocdoni/sdk'
 import { FieldValues } from 'react-hook-form'
 import { useConfirm } from '@vocdoni/chakra-components'
 import { ElectionStateStorage } from '~components/Process/MultiElectionContext'

diff --git a/src/components/Process/MultiElectionContext.tsx b/src/components/Process/MultiElectionContext.tsx
@@ -4,7 +4,7 @@ import { PublishedElection, VocdoniSDKClient } from '@vocdoni/sdk'
 import { Wallet } from '@ethersproject/wallet'
 import { useElection, ElectionState } from '@vocdoni/react-providers'
 import { MultiElectionConfirmation } from './MultiElectionConfirmation'
-import { useConfirm, getVotePackage } from '@vocdoni/chakra-components'
+import { useConfirm, getVoteBallot } from '@vocdoni/chakra-components'
 
 export type MultiElectionFormContextState = {
   fmethods: UseFormReturn<any>
@@ -80,7 +80,7 @@ const useMultiElectionsProvider = ({
 
     const votingList = Object.entries(electionsStates).map(([key, { election, vote }]) => {
       if (!(election instanceof PublishedElection) || !values[election.id]) return Promise.resolve()
-      const votePackage = getVotePackage(election, values[election.id])
+      const votePackage = getVoteBallot(election, values[election.id])
       return vote(votePackage)
     })
     return Promise.all(votingList).finally(() => setVoting(false))

diff --git a/src/components/Process/MultiElectionQuestions.tsx b/src/components/Process/MultiElectionQuestions.tsx
@@ -1,11 +1,6 @@
-import {
-  MultiElectionsProvider,
-  MultiElectionsProviderProps,
-  SubElectionState,
-  useMultiElections,
-} from './MultiElectionContext'
+import { SubElectionState, useMultiElections } from './MultiElectionContext'
 import { ElectionProvider, useElection } from '@vocdoni/react-providers'
-import { ComponentType, useEffect, useMemo, useState } from 'react'
+import { ComponentType, useEffect, useMemo } from 'react'
 import { PublishedElection } from '@vocdoni/sdk'
 import { ButtonProps } from '@chakra-ui/button'
 import {
@@ -14,6 +9,7 @@ import {
   DefaultElectionFormId,
   VoteButtonLogic,
 } from '@vocdoni/chakra-components'
+import { Flex } from '@chakra-ui/react'
 
 export type MultiElectionQuestionsFormProps = { ConnectButton?: ComponentType } & ElectionQuestionsFormProps
 
@@ -39,15 +35,14 @@ export const MultiElectionQuestionsForm = ({
 
   return (
     <form onSubmit={fmethods.handleSubmit(voteAll, onInvalid)} id={formId ?? DefaultElectionFormId}>
-      {/*<ElectionQuestion {...props} />*/}
       {renderWith.length > 0 && (
-        <>
+        <Flex direction={'column'} gap={10}>
           {renderWith.map(({ id }) => (
             <ElectionProvider key={id} ConnectButton={ConnectButton} id={id} fetchCensus>
               <SubElectionQuestions {...props} />
             </ElectionProvider>
           ))}
-        </>
+        </Flex>
       )}
     </form>
   )
@@ -86,22 +81,6 @@ const SubElectionQuestions = (props: Omit<MultiElectionQuestionsFormProps, 'Conn
       return
     }
     addElection(subElectionState)
-
-    // }
-    // ;(async () => {
-    //   if (
-    //     election &&
-    //     election instanceof PublishedElection
-    //     // client?.wallet &&
-    //     // typeof client.wallet.getAddress === 'function'
-    //   ) {
-    //     // Store the election if wallet contain address
-    //     // const address = await client.wallet.getAddress()
-    //     // if (walletAddress === address && elections[election.id]) return
-    //     // setWalletAddress(address)
-    //     addElection({ election, vote, isAbleToVote, voted })
-    //   }
-    // })()
   }, [subElectionState, elections, election])
 
   return <ElectionQuestion {...props} />

diff --git a/src/theme/components/Questions.ts b/src/theme/components/Questions.ts
@@ -62,11 +62,9 @@ const baseStyle = definePartsStyle({
   },
 
   wrapper: {
-    '& > form': {
-      display: 'flex',
-      flexDirection: 'column',
-      gap: 10,
-    },
+    display: 'flex',
+    flexDirection: 'column',
+    gap: 10,
   },
 
   question: {