diff --git a/packages/ui/src/app/pages/Election/Election.tsx b/packages/ui/src/app/pages/Election/Election.tsx
index cde7c7fae7..cc2696e2e1 100644
--- a/packages/ui/src/app/pages/Election/Election.tsx
+++ b/packages/ui/src/app/pages/Election/Election.tsx
@@ -9,7 +9,6 @@ import { Loading } from '@/common/components/Loading'
import { MainPanel } from '@/common/components/page/PageContent'
import { PageTitle } from '@/common/components/page/PageTitle'
import { BlockDurationStatistics, StatisticItem, Statistics } from '@/common/components/statistics'
-import { TooltipExternalLink } from '@/common/components/Tooltip'
import { TextHuge, TextMedium } from '@/common/components/typography'
import { camelCaseToText } from '@/common/helpers'
import { useRefetchQueries } from '@/common/hooks/useRefetchQueries'
@@ -92,35 +91,16 @@ export const Election = () => {
- Elections occur periodically, and each one has a sequence of stages referred to as the election cycle.
- Stages are: announcing period, voting period and revealing period.{' '}
-
- More details
-
- >
- }
+ tooltipText="Elections occur periodically. Each has a sequence of stages referred to as the election cycle. Stages are: announcing period, voting period and revealing period."
+ tooltipLinkURL="https://joystream.gitbook.io/testnet-workspace/system/council?q=lock#election"
>
{camelCaseToText(electionStage)} Period
- Remaining length of current period before the next one starts.{' '}
-
- Link
-
- >
- }
value={remainingPeriod}
+ tooltipText="Remaining length of current period before the next one starts."
+ tooltipLinkURL="https://joystream.gitbook.io/testnet-workspace/system/council?q=lock#election"
/>
{
/>
-
- Staking, or bonding, is the act of locking up funds under some terms so that they are not
- transferable and otherwise not entirely usable as they otherwise would be. The terms, referred to
- as unstaking terms describe the circumstances under which the funds may begin to cease being
- staked. The way staking is implemented is with the use of account{' '}
-
- locks
-
- {' '}
- >
- }
+ tooltipText="Staking, or bonding, is the act of locking up funds under some terms so that they are not transferable and otherwise not entirely usable as they otherwise would be. The terms, referred to as unstaking terms describe the circumstances under which the funds may begin to cease being staked. The way staking is implemented is with the use of account."
+ tooltipLinkURL="https://joystream.gitbook.io/joystream-handbook/key-concepts/staking#locks"
value={locked}
/>
-
+
{vestingTotal.gtn(0) && (
)}
@@ -67,7 +60,7 @@ export const MyAccounts = () => {
{vestingTotal.gtn(0) && (
diff --git a/packages/ui/src/app/pages/WorkingGroups/UpcomingOpening.tsx b/packages/ui/src/app/pages/WorkingGroups/UpcomingOpening.tsx
index a8365ab240..c0588c9bf6 100644
--- a/packages/ui/src/app/pages/WorkingGroups/UpcomingOpening.tsx
+++ b/packages/ui/src/app/pages/WorkingGroups/UpcomingOpening.tsx
@@ -45,7 +45,7 @@ export const UpcomingOpening = () => {
The opening hasn't started yet
- Lorem ipsum dolor sit amet.Lorem ipsum dolor sit amet.
+ This opening becomes available for applications when at the set block.
))
diff --git a/packages/ui/src/app/pages/WorkingGroups/WorkingGroup/AboutTab.tsx b/packages/ui/src/app/pages/WorkingGroups/WorkingGroup/AboutTab.tsx
index a573acd0ab..e6394c7cb3 100644
--- a/packages/ui/src/app/pages/WorkingGroups/WorkingGroup/AboutTab.tsx
+++ b/packages/ui/src/app/pages/WorkingGroups/WorkingGroup/AboutTab.tsx
@@ -27,7 +27,7 @@ export const AboutTab = ({ workingGroup }: Props) => {
{statistics.spending ? (
) : (
diff --git a/packages/ui/src/app/pages/WorkingGroups/WorkingGroup/OpeningsTab.tsx b/packages/ui/src/app/pages/WorkingGroups/WorkingGroup/OpeningsTab.tsx
index 2e38ed3873..2bc6509271 100644
--- a/packages/ui/src/app/pages/WorkingGroups/WorkingGroup/OpeningsTab.tsx
+++ b/packages/ui/src/app/pages/WorkingGroups/WorkingGroup/OpeningsTab.tsx
@@ -6,7 +6,6 @@ import { LinkSymbol } from '@/common/components/icons/symbols'
import { MainPanel } from '@/common/components/page/PageContent'
import { SidePanel } from '@/common/components/page/SidePanel'
import { Statistics, TokenValueStat } from '@/common/components/statistics'
-import { TooltipExternalLink } from '@/common/components/Tooltip'
import { Label, TextMedium } from '@/common/components/typography'
import { LoadingOpenings } from '@/working-groups/components/OpeningsList'
import { WorkersList } from '@/working-groups/components/WorkersList'
@@ -30,18 +29,8 @@ export const OpeningsTab = ({ workingGroup }: Props) => {
- The budget is the root resource pool for all token minting in the working group, and the size of the pool
- is denoted by budget.
-
- Link
-
- >
- }
+ tooltipText="The budget is the root resource pool for all token minting in the working group, and the size of the pool is denoted by budget."
+ tooltipLinkURL="https://joystream.gitbook.io/testnet-workspace/system/working-groups?q=lock#concepts"
value={workingGroup.budget}
/>
{
/>
- Average stake size by members undertaking the roles of workers and the lead in this group.{' '}
-
- Link
-
- >
- }
value={workingGroup.averageStake}
+ tooltipText="Average stake size by members undertaking the roles of workers and the lead in this group."
+ tooltipLinkURL="https://joystream.gitbook.io/testnet-workspace/system/working-groups?q=lock#concepts"
/>
diff --git a/packages/ui/src/app/pages/WorkingGroups/WorkingGroupsOpening.tsx b/packages/ui/src/app/pages/WorkingGroups/WorkingGroupsOpening.tsx
index 0a73ea9bf3..7773bb1d74 100644
--- a/packages/ui/src/app/pages/WorkingGroups/WorkingGroupsOpening.tsx
+++ b/packages/ui/src/app/pages/WorkingGroups/WorkingGroupsOpening.tsx
@@ -153,7 +153,11 @@ export const WorkingGroupOpening = () => {
title={`Reward per ${rewardPeriod?.toString()} blocks`}
value={rewardPeriod?.mul(opening.rewardPerBlock)}
/>
-
+
diff --git a/packages/ui/src/council/components/pastCouncil/PastCouncilStats.tsx b/packages/ui/src/council/components/pastCouncil/PastCouncilStats.tsx
index a9b3f1450a..9e22682ee2 100644
--- a/packages/ui/src/council/components/pastCouncil/PastCouncilStats.tsx
+++ b/packages/ui/src/council/components/pastCouncil/PastCouncilStats.tsx
@@ -1,10 +1,7 @@
import BN from 'bn.js'
import React from 'react'
-import { LinkSymbol } from '@/common/components/icons/symbols'
import { Statistics, TokenValueStat } from '@/common/components/statistics'
-import { TooltipExternalLink } from '@/common/components/Tooltip'
-import { TextMedium } from '@/common/components/typography'
interface PastCouncilStatsProps {
totalSpent: BN
@@ -28,7 +25,8 @@ export const PastCouncilStats = ({
- Total council budget spent on proposals, including funding proposals. More details on proposals spending can
- be found in the Overview module{' '}
-
- Link
-
- >
- }
+ tooltipText="Total council budget spent on proposals, including funding proposals. More details on proposals spending can be found in the Overview module."
+ tooltipLinkURL="https://joystream.gitbook.io/joystream-handbook/governance/council#council"
/>
)
diff --git a/packages/ui/src/proposals/components/ProposalList/ProposalListItem.tsx b/packages/ui/src/proposals/components/ProposalList/ProposalListItem.tsx
index e6af9e4d6d..6e04d27f6f 100644
--- a/packages/ui/src/proposals/components/ProposalList/ProposalListItem.tsx
+++ b/packages/ui/src/proposals/components/ProposalList/ProposalListItem.tsx
@@ -5,11 +5,12 @@ import styled from 'styled-components'
import { BadgeStatus } from '@/common/components/BadgeStatus'
import { CopyButtonTemplate } from '@/common/components/buttons'
import { LinkIcon } from '@/common/components/icons'
+import { LinkSymbol } from '@/common/components/icons/symbols'
import { TableListItem } from '@/common/components/List'
import { GhostRouterLink } from '@/common/components/RouterLink'
import { Tooltip, TooltipDefault } from '@/common/components/Tooltip'
import { Subscription } from '@/common/components/typography/Subscription'
-import { TextSmall } from '@/common/components/typography/Text'
+import { TextSmall, TextMedium } from '@/common/components/typography/Text'
import { Colors, Overflow } from '@/common/constants'
import { camelCaseToText } from '@/common/helpers'
import { toDDMMYY } from '@/common/utils/dates'
@@ -44,6 +45,8 @@ export const ProposalListItem = ({ proposal, isPast, memberId, isCouncilMember }
return 'Proposal was approved by current council, but requires further approvals to satisfy constitutionality requirement, which is a minimum number of consecutive council votes. Transitions to deciding stage when next council is elected.'
case 'gracing':
return 'Proposal was approved by current council, but requires further approvals to satisfy constitutionality requirement, which is a minimum number of consecutive council votes. Transitions to deciding stage when next council is elected.'
+ case 'expired':
+ return 'This proposal expired, meaning it was not executed due to council not voting on it during its term.'
case 'vetoed':
return 'Was halted by SUDO, nothing further can happen. This will be removed at mainnet.'
case 'slashed':
@@ -74,7 +77,10 @@ export const ProposalListItem = ({ proposal, isPast, memberId, isCouncilMember }
{camelCaseToText(proposal.status)}
-
+