diff --git a/packages/desktop/views/dashboard/governance/components/ProposalAnswer.svelte b/packages/desktop/views/dashboard/governance/components/ProposalAnswer.svelte index b89128bcd9..e58a956e06 100644 --- a/packages/desktop/views/dashboard/governance/components/ProposalAnswer.svelte +++ b/packages/desktop/views/dashboard/governance/components/ProposalAnswer.svelte @@ -1,6 +1,6 @@ {#if status} - +
{#if error} diff --git a/packages/desktop/views/dashboard/governance/components/proposal-details/ProposalAccountVotingPane.svelte b/packages/desktop/views/dashboard/governance/components/proposal-details/ProposalAccountVotingPane.svelte index a79ed2c8f7..dd3fdda96c 100644 --- a/packages/desktop/views/dashboard/governance/components/proposal-details/ProposalAccountVotingPane.svelte +++ b/packages/desktop/views/dashboard/governance/components/proposal-details/ProposalAccountVotingPane.svelte @@ -18,14 +18,13 @@ const { metadata } = $visibleSelectedAccountTokens?.[$activeProfile?.network?.id]?.baseCoin ?? {} let totalVotes = BigInt(0) - const hasMounted = false $: selectedProposalOverview = $participationOverviewForSelectedAccount?.participations?.[$selectedProposal?.id] $: trackedParticipations = Object.values(selectedProposalOverview ?? {}) $: currentMilestone = $networkStatus.currentMilestone // Reactively start updating votes once component has mounted and participation overview is available. - $: hasMounted && $selectedParticipationEventStatus && trackedParticipations && currentMilestone && setTotalVotes() + $: $selectedParticipationEventStatus && trackedParticipations && currentMilestone && setTotalVotes() function setTotalVotes(): void { switch ($selectedParticipationEventStatus?.status) { diff --git a/packages/shared/src/lib/core/activity/utils/getActivityTileAction.ts b/packages/shared/src/lib/core/activity/utils/getActivityTileAction.ts index 0c6de07927..0fc3b7213b 100644 --- a/packages/shared/src/lib/core/activity/utils/getActivityTileAction.ts +++ b/packages/shared/src/lib/core/activity/utils/getActivityTileAction.ts @@ -17,7 +17,7 @@ export function getActivityTileAction(activity: Activity): string | undefined { } else if (activity.governanceAction === GovernanceAction.DecreaseVotingPower) { return isConfirmed ? 'general.decreased' : 'general.decreasing' } else if (activity.governanceAction === GovernanceAction.StartVoting) { - return isConfirmed ? 'general.voteStarted' : 'general.voteStarting' + return isConfirmed ? 'general.votedOn' : 'general.votingOn' } else if (activity.governanceAction === GovernanceAction.StopVoting) { return isConfirmed ? 'general.unvoted' : 'general.unvoting' } else if (activity.governanceAction === GovernanceAction.ChangedVote) { diff --git a/packages/shared/src/locales/en.json b/packages/shared/src/locales/en.json index 2889f1cb43..b3f1c6ef70 100644 --- a/packages/shared/src/locales/en.json +++ b/packages/shared/src/locales/en.json @@ -1085,19 +1085,19 @@ "Conflicting": "Failed to decrease voting power" }, "startVoting": { - "Pending": "Voting for {proposalName}", - "Confirmed": "Voted for {proposalName}", - "Conflicting": "Failed to vote for" + "Pending": "Voting on {proposalName}", + "Confirmed": "Voted on {proposalName}", + "Conflicting": "Failed to vote on" }, "stopVoting": { - "Pending": "Stopping voting for {proposalName}", - "Confirmed": "Stopped voting for {proposalName}", - "Conflicting": "Failed to stop voting for" + "Pending": "Stopping voting on {proposalName}", + "Confirmed": "Stopped voting on {proposalName}", + "Conflicting": "Failed to stop voting on" }, "changedVote": { - "Pending": "Changing vote for {proposalName}", - "Confirmed": "Changed vote for {proposalName}", - "Conflicting": "Failed to change vote for" + "Pending": "Changing vote on {proposalName}", + "Confirmed": "Changed vote on {proposalName}", + "Conflicting": "Failed to change vote on" }, "revote": { "Pending": "Revoting", @@ -1219,7 +1219,7 @@ "revote": { "title": "Revote on proposals", "body": "Changing your voting power temporarily stops your votes for all proposals from being counted. Simply click \"Revote\" to resume voting.", - "hint": "Bloom remembers all of the proposals and answer options you previously voted for." + "hint": "Bloom remembers all the proposals and answer options you previously voted for." }, "removeProposal": { "title": "Remove proposal", @@ -1404,6 +1404,8 @@ "decreasing": "Decreasing voting", "voted": "Voted", "voting": "Voting", + "votingOn": "Voting on", + "votedOn": "Voted on", "changedVote": "Changed vote", "changingVote": "Changing vote", "revoted": "Revoted",