Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: rebrand ProposalQuestion #1967

Merged
merged 4 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/desktop/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export { default as Proposals } from './Proposals.svelte'
export { default as ProposalAnswer } from './ProposalAnswer.svelte'
export { default as ProposalCard } from './ProposalCard.svelte'
export { default as ProposalsDetails } from './ProposalsDetails.svelte'
export { default as ProposalQuestion } from './ProposalQuestion.svelte'
export { default as SidebarTab } from './SidebarTab.svelte'
export { default as StatusTile, type StatusTileProps } from './StatusTile.svelte'
export { default as TitleBar } from './TitleBar.svelte'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
TrackedParticipationOverview,
} from '@iota/sdk/out/types'
import { Alert, Button, Table } from '@bloomwalletio/ui'
import { ProposalDetailsMenu, ProposalQuestion } from '@components'
import { ProposalDetailsMenu } from '@components'
import { getVotingEvent } from '@contexts/governance/actions'
import {
clearParticipationEventStatusPoll,
Expand Down Expand Up @@ -35,7 +35,7 @@
import { visibleSelectedAccountTokens } from '@core/token/stores'
import { getBestTimeDuration, milestoneToDate } from '@core/utils'
import { PopupId, openPopup } from '@desktop/auxiliary/popup'
import { ProposalInformationPane, ProposalStatusPill } from '@views/governance'
import { ProposalInformationPane, ProposalQuestion, ProposalStatusPill } from '@views/governance'
import { MarkdownBlock, Pane, Text, TextType } from '@ui'
import { onDestroy, onMount } from 'svelte'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@
import { AnswerStatus, EventStatus, Question } from '@iota/sdk/out/types'

import { ProposalAnswer } from '@components'
import { Icon, Text } from '@ui'
import { FontWeight } from '@ui/enums'
import { TooltipIcon } from '@bloomwalletio/ui'
import { Icon, IconName, Text, TooltipIcon } from '@bloomwalletio/ui'

import { ABSTAIN_VOTE_VALUE } from '@contexts/governance/constants'
import { getPercentagesFromAnswerStatuses, IProposalAnswerPercentages } from '@contexts/governance'
import { selectedProposal } from '@contexts/governance/stores'

import { Icon as IconEnum } from '@auxiliary/icon'

export let onQuestionClick: (questionIndex: number) => void
export let onAnswerClick: (answerValue: number, questionIndex: number) => void

Expand Down Expand Up @@ -49,31 +45,27 @@
</script>

<proposal-question
class="flex flex-col px-5 py-4 rounded-xl border border-solid border-gray-200
cursor-pointer dark:border-transparent dark:bg-gray-900"
class="flex flex-col px-5 py-4 rounded-xl border border-solid border-stroke
cursor-pointer dark:border-stroke-dark dark:bg-surface-dark"
class:animate-pulse={isLoading}
>
<button on:click={() => onQuestionClick(questionIndex)} class="flex justify-between items-center">
<div class="flex flex-col min-w-0">
<div class="flex flex-col min-w-0 gap-1">
{#if questionIndex !== undefined}
<Text smaller fontWeight={FontWeight.bold} overrideColor classes="mb-1 text-blue-500">
Question {questionIndex + 1}
</Text>
<Text align="left">Question {questionIndex + 1}</Text>
{/if}
<div class="flex flex-row space-x-1.5 items-center">
<Text
fontWeight={FontWeight.bold}
overrideColor
classes="text-gray-900 dark:text-white {isOpened ? '' : 'truncate'}"
>
<Text align="left" fontWeight="medium" textColor="secondary" truncate={!isOpened}>
{question.text}
</Text>
{#if question.additionalInfo}
<TooltipIcon tooltip={question.additionalInfo} placement="bottom" size="xxs" />
{/if}
</div>
</div>
<Icon icon={IconEnum.ChevronDown} classes="text-gray-500 transform {isOpened ? 'rotate-180' : 'rotate-0'}" />
<div class="transform {isOpened ? 'rotate-180' : 'rotate-0'}">
<Icon name={IconName.ChevronDown} textColor="secondary" />
</div>
</button>
<proposal-answers class:mt-4={showMargin} class="flex flex-col gap-2">
{#each answers as answer, answerIndex}
Expand Down
1 change: 1 addition & 0 deletions packages/desktop/views/governance/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export { default as ProposalInformationPane } from './ProposalInformationPane.svelte'
export { default as ProposalQuestion } from './ProposalQuestion.svelte'
export { default as ProposalStatusInfo } from './ProposalStatusInfo.svelte'
export { default as ProposalStatusPill } from './ProposalStatusPill.svelte'
export { default as ProposalStatusTimelineTooltip } from './ProposalStatusTimelineTooltip.svelte'
Loading