Merge branch 'develop' into ui/rebrand-governance-background

bloomwalletio · Feb 20, 2024 · 64de3f3 · 64de3f3
2 parents 508dc97 + 7e03f84
commit 64de3f3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/packages/desktop/components/index.ts b/packages/desktop/components/index.ts
@@ -2,7 +2,6 @@ export * from './drawers'
 export * from './filter'
 export * from './menus'
 export * from './modals'
-export * from './panes'
 export * from './popup'
 
 export { default as AccountSwitcher } from './AccountSwitcher.svelte'

diff --git a/packages/desktop/components/panes/index.ts b/packages/desktop/components/panes/index.ts
diff --git a/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte b/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
@@ -6,7 +6,7 @@
         TrackedParticipationOverview,
     } from '@iota/sdk/out/types'
     import { Alert, Button, Table } from '@bloomwalletio/ui'
-    import { ProposalDetailsMenu, ProposalInformationPane, ProposalQuestion } from '@components'
+    import { ProposalDetailsMenu, ProposalQuestion } from '@components'
     import { getVotingEvent } from '@contexts/governance/actions'
     import {
         clearParticipationEventStatusPoll,
@@ -35,7 +35,7 @@
     import { visibleSelectedAccountTokens } from '@core/token/stores'
     import { getBestTimeDuration, milestoneToDate } from '@core/utils'
     import { PopupId, openPopup } from '@desktop/auxiliary/popup'
-    import { ProposalStatusPill } from '@views/governance'
+    import { ProposalInformationPane, ProposalStatusPill } from '@views/governance'
     import { MarkdownBlock, Pane, Text, TextType } from '@ui'
     import { onDestroy, onMount } from 'svelte'
 
@@ -242,7 +242,7 @@
                 ]}
             />
         </Pane>
-        <ProposalInformationPane classes="shrink-0" />
+        <ProposalInformationPane />
     </div>
     <Pane classes="w-3/5 h-full p-6 pr-3 flex flex-col justify-between">
         <proposal-questions

diff --git a/...ents/panes/ProposalInformationPane.svelte → ...components/ProposalInformationPane.svelte b/...ents/panes/ProposalInformationPane.svelte → ...components/ProposalInformationPane.svelte
@@ -1,14 +1,12 @@
 <script lang="ts">
     import { EventStatus } from '@iota/sdk/out/types'
-    import { Table } from '@bloomwalletio/ui'
-    import { Pane, Text } from '@ui'
+    import { Table, Text } from '@bloomwalletio/ui'
+    import { Pane } from '@ui'
     import { formatDate, localize } from '@core/i18n'
     import { DATE_FORMAT, milestoneToDate, truncateString } from '@core/utils'
     import { networkStatus } from '@core/network/stores'
     import { selectedProposal } from '@contexts/governance/stores'
 
-    export let classes: string = ''
-
     interface IProposalDateData {
         propertyKey: 'votingOpens' | 'countingStarts' | 'countingEnds' | 'countingEnded'
         milestone: number
@@ -44,10 +42,8 @@
     }
 </script>
 
-<Pane classes="p-6 h-fit {classes}">
-    <Text smaller classes="mb-5">
-        {localize('views.governance.details.proposalInformation.title')}
-    </Text>
+<Pane classes="h-fit shrink-0 space-y-6 p-6">
+    <Text type="body2">{localize('views.governance.details.proposalInformation.title')}</Text>
     <Table
         items={[
             {

diff --git a/packages/desktop/views/governance/components/index.ts b/packages/desktop/views/governance/components/index.ts
@@ -1,3 +1,4 @@
+export { default as ProposalInformationPane } from './ProposalInformationPane.svelte'
 export { default as ProposalStatusInfo } from './ProposalStatusInfo.svelte'
 export { default as ProposalStatusPill } from './ProposalStatusPill.svelte'
 export { default as ProposalStatusTimelineTooltip } from './ProposalStatusTimelineTooltip.svelte'