enhancement: add warnings for merging vote/stake

iotaledger · May 31, 2022 · d27c21e · d27c21e
1 parent 99ef3ae
commit d27c21e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 12 deletions.
diff --git a/packages/shared/components/popups/GovernanceManager.svelte b/packages/shared/components/popups/GovernanceManager.svelte
@@ -4,6 +4,7 @@
     import { promptUserToConnectLedger } from 'shared/lib/ledger'
     import { hasNodePlugin } from 'shared/lib/networkStatus'
     import { showAppNotification } from 'shared/lib/notifications'
+    import { stakedAmount } from 'shared/lib/participation'
     import {
         currentAccountTreasuryVotePartiallyUnvotedAmount,
         currentAccountTreasuryVoteValue,
@@ -370,12 +371,24 @@
                     },
                 })}
             </Text>
-            <div class="flex items-center mb-6 bg-blue-50 dark:bg-gray-800 rounded-xl p-4">
+            <div
+                class="flex items-center {$stakedAmount > 0
+                    ? 'mb-4'
+                    : 'mb-6'} bg-blue-50 dark:bg-gray-800 rounded-xl p-4"
+            >
                 <Icon icon="exclamation" classes="text-gray-500" />
                 <Text type="p" classes="px-3">
                     {localize('popups.governanceManager.mergeVoteDisclaimer')}
                 </Text>
             </div>
+            {#if $stakedAmount > 0}
+                <div class="flex items-center mb-6 bg-blue-50 dark:bg-gray-800 rounded-xl p-4">
+                    <Icon icon="exclamation" classes="text-gray-500" />
+                    <Text type="p" classes="px-3">
+                        {localize('popups.governanceManager.mergeVoteDisclaimerStaking')}
+                    </Text>
+                </div>
+            {/if}
             <div class="flex flex-row justify-between space-x-4 w-full">
                 <Button
                     disabled={loading}

diff --git a/packages/shared/components/popups/StakingManager.svelte b/packages/shared/components/popups/StakingManager.svelte
@@ -22,7 +22,7 @@
         shimmerStakingEventState,
         resetPerformingParticipation,
     } from 'shared/lib/participation/stores'
-    import { isPartiallyStaked } from 'shared/lib/participation/account'
+    import { isPartiallyStaked, currentAccountTreasuryVoteValue } from 'shared/lib/participation/account'
     import {
         AccountParticipationAbility,
         Participation,
@@ -190,6 +190,17 @@
 
 <Text type="h4" classes="mb-2">{localize('popups.stakingManager.title')}</Text>
 <Text type="p" secondary classes="mb-4">{localize('popups.stakingManager.description')}</Text>
+
+{#if $currentAccountTreasuryVoteValue}
+    <TextHint
+        classes="p-4 rounded-2xl bg-blue-50 dark:bg-gray-800 mb-6"
+        icon="info"
+        iconClasses="fill-current text-blue-500 dark:text-blue-500"
+        hint={localize('popups.stakingManager.mergeStakeDisclaimerVoting')}
+        hintClasses="text-gray-500 dark:text-gray-500"
+    />
+{/if}
+
 <div class="staking flex flex-col mb-4">
     {#if participationAbility !== AccountParticipationAbility.HasDustAmount}
         <div
@@ -319,14 +330,6 @@
     {/if}
 </div>
 
-<TextHint
-    classes="p-4 rounded-2xl bg-blue-50 dark:bg-gray-800"
-    icon="info"
-    iconClasses="fill-current text-blue-500 dark:text-blue-500"
-    hint={localize('popups.stakingManager.singleAccountHint')}
-    hintClasses="text-gray-500 dark:text-gray-500"
-/>
-
 {#if showTooltip}
     <Tooltip anchor={tooltipAnchor} position="right">
         <Text type="p" classes="text-gray-900 bold mb-1 text-left">

diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json
@@ -849,7 +849,7 @@
             "totalFundsStaked": "Total funds staked",
             "stakedSuccessfully": "Your funds have been staked for {account}.",
             "unstakedSuccessfully": "Your funds have been unstaked for {account}.",
-            "singleAccountHint": "Looking for your wallets? Firefly has changed. Toggle between your wallets in the top menu bar."
+            "mergeStakeDisclaimerVoting": "Merging your stake will also merge your votes."
         },
         "stakingConfirmation": {
             "title": "Confirm Participation",
@@ -878,7 +878,8 @@
             "changingVote": "Changing vote",
             "manageVotes": "Manage votes",
             "partialVoteInfo": "You have received {amount} to {account}. You can vote with these funds by merging them with your current vote.",
-            "mergeVoteDisclaimer": "Please note that merging votes won't impact any votes that have already been counted",
+            "mergeVoteDisclaimer": "Please note that merging votes won't impact any votes that have already been counted.",
+            "mergeVoteDisclaimerStaking": "Merging your vote will also merge your staked funds.",
             "mergingVotes": "Merging votes",
             "votedSuccessfully": "You have started voting with {account}.",
             "unvotedSuccessfully": "You have stopped voting with {account}.",