Skip to content

Commit cd4930e

Browse files
committed
Fix styles
1 parent b0ab79d commit cd4930e

File tree

5 files changed

+12
-35
lines changed

5 files changed

+12
-35
lines changed

src/components/Process/Chained.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { VoteButton } from '~components/Process/Aside'
99
import BlindCSPConnect from '~components/Process/BlindCSPConnect'
1010
import { ChainedProvider, useChainedProcesses } from './ChainedContext'
1111
import { ConfirmVoteModal } from './ConfirmVoteModal'
12-
import { MultiElectionQuestionsForm, MultiElectionVoteButton } from '~components/Process/MultiElectionQuestions'
12+
import { MultiElectionQuestionsForm } from '~components/Process/MultiElectionQuestions'
1313
import { MultiElectionsProvider } from '~components/Process/MultiElectionContext'
1414

1515
type ChainedProcessesInnerProps = {

src/components/Process/MultiElectionConfirmation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Box, Text } from '@chakra-ui/layout'
33
import { ModalBody, ModalCloseButton, ModalFooter, ModalHeader } from '@chakra-ui/modal'
44
import { chakra, omitThemingProps, useMultiStyleConfig } from '@chakra-ui/system'
55
import { useClient } from '@vocdoni/react-providers'
6-
import { ElectionResultsTypeNames, PublishedElection } from '@vocdoni/sdk'
6+
import { ElectionResultsTypeNames } from '@vocdoni/sdk'
77
import { FieldValues } from 'react-hook-form'
88
import { useConfirm } from '@vocdoni/chakra-components'
99
import { ElectionStateStorage } from '~components/Process/MultiElectionContext'

src/components/Process/MultiElectionContext.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { PublishedElection, VocdoniSDKClient } from '@vocdoni/sdk'
44
import { Wallet } from '@ethersproject/wallet'
55
import { useElection, ElectionState } from '@vocdoni/react-providers'
66
import { MultiElectionConfirmation } from './MultiElectionConfirmation'
7-
import { useConfirm, getVotePackage } from '@vocdoni/chakra-components'
7+
import { useConfirm, getVoteBallot } from '@vocdoni/chakra-components'
88

99
export type MultiElectionFormContextState = {
1010
fmethods: UseFormReturn<any>
@@ -80,7 +80,7 @@ const useMultiElectionsProvider = ({
8080

8181
const votingList = Object.entries(electionsStates).map(([key, { election, vote }]) => {
8282
if (!(election instanceof PublishedElection) || !values[election.id]) return Promise.resolve()
83-
const votePackage = getVotePackage(election, values[election.id])
83+
const votePackage = getVoteBallot(election, values[election.id])
8484
return vote(votePackage)
8585
})
8686
return Promise.all(votingList).finally(() => setVoting(false))

src/components/Process/MultiElectionQuestions.tsx

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
import {
2-
MultiElectionsProvider,
3-
MultiElectionsProviderProps,
4-
SubElectionState,
5-
useMultiElections,
6-
} from './MultiElectionContext'
1+
import { SubElectionState, useMultiElections } from './MultiElectionContext'
72
import { ElectionProvider, useElection } from '@vocdoni/react-providers'
8-
import { ComponentType, useEffect, useMemo, useState } from 'react'
3+
import { ComponentType, useEffect, useMemo } from 'react'
94
import { PublishedElection } from '@vocdoni/sdk'
105
import { ButtonProps } from '@chakra-ui/button'
116
import {
@@ -14,6 +9,7 @@ import {
149
DefaultElectionFormId,
1510
VoteButtonLogic,
1611
} from '@vocdoni/chakra-components'
12+
import { Flex } from '@chakra-ui/react'
1713

1814
export type MultiElectionQuestionsFormProps = { ConnectButton?: ComponentType } & ElectionQuestionsFormProps
1915

@@ -39,15 +35,14 @@ export const MultiElectionQuestionsForm = ({
3935

4036
return (
4137
<form onSubmit={fmethods.handleSubmit(voteAll, onInvalid)} id={formId ?? DefaultElectionFormId}>
42-
{/*<ElectionQuestion {...props} />*/}
4338
{renderWith.length > 0 && (
44-
<>
39+
<Flex direction={'column'} gap={10}>
4540
{renderWith.map(({ id }) => (
4641
<ElectionProvider key={id} ConnectButton={ConnectButton} id={id} fetchCensus>
4742
<SubElectionQuestions {...props} />
4843
</ElectionProvider>
4944
))}
50-
</>
45+
</Flex>
5146
)}
5247
</form>
5348
)
@@ -86,22 +81,6 @@ const SubElectionQuestions = (props: Omit<MultiElectionQuestionsFormProps, 'Conn
8681
return
8782
}
8883
addElection(subElectionState)
89-
90-
// }
91-
// ;(async () => {
92-
// if (
93-
// election &&
94-
// election instanceof PublishedElection
95-
// // client?.wallet &&
96-
// // typeof client.wallet.getAddress === 'function'
97-
// ) {
98-
// // Store the election if wallet contain address
99-
// // const address = await client.wallet.getAddress()
100-
// // if (walletAddress === address && elections[election.id]) return
101-
// // setWalletAddress(address)
102-
// addElection({ election, vote, isAbleToVote, voted })
103-
// }
104-
// })()
10584
}, [subElectionState, elections, election])
10685

10786
return <ElectionQuestion {...props} />

src/theme/components/Questions.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,9 @@ const baseStyle = definePartsStyle({
6262
},
6363

6464
wrapper: {
65-
'& > form': {
66-
display: 'flex',
67-
flexDirection: 'column',
68-
gap: 10,
69-
},
65+
display: 'flex',
66+
flexDirection: 'column',
67+
gap: 10,
7068
},
7169

7270
question: {

0 commit comments

Comments
 (0)