chore: simplify account properties

iotaledger · Mar 2, 2023 · 5528a2b · 5528a2b
1 parent 0aac3d6
commit 5528a2b
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 23 deletions.
diff --git a/packages/desktop/components/popups/ManageVotingPowerPopup.svelte b/packages/desktop/components/popups/ManageVotingPowerPopup.svelte
@@ -24,9 +24,7 @@
     $: asset = $visibleSelectedAccountAssets?.baseCoin
     $: votingPower = parseInt($selectedAccount?.votingPower, 10)
     $: hasTransactionInProgress =
-        $selectedAccount?.hasVotingPowerTransactionInProgress ||
-        $selectedAccount?.hasVotingTransactionInProgress ||
-        $selectedAccount?.isTransferring
+        $selectedAccount?.processingGovernanceTransactionType !== null || $selectedAccount?.isTransferring
     $: amount, hasTransactionInProgress, setConfirmDisabled()
 
     function setConfirmDisabled(): void {
@@ -57,7 +55,7 @@
 
             await checkActiveProfileAuth(
                 async () => {
-                    await setVotingPower(rawAmount, isVoting)
+                    await setVotingPower(rawAmount)
                 },
                 { stronghold: true, ledger: false }
             )

diff --git a/packages/desktop/components/popups/RevotePopup.svelte b/packages/desktop/components/popups/RevotePopup.svelte
@@ -6,8 +6,7 @@
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { vote } from '@contexts/governance/actions'
 
-    $: hasGovernanceTransactionInProgress =
-        $selectedAccount?.hasVotingPowerTransactionInProgress || $selectedAccount?.hasVotingTransactionInProgress
+    $: hasGovernanceTransactionInProgress = $selectedAccount?.processingGovernanceTransactionType !== null
 
     async function onSubmit(): Promise<void> {
         await checkActiveProfileAuth(async () => {

diff --git a/packages/desktop/components/popups/StopVotingPopup.svelte b/packages/desktop/components/popups/StopVotingPopup.svelte
@@ -8,8 +8,7 @@
     import { selectedAccount } from '@core/account/stores'
     import { checkActiveProfileAuth } from '@core/profile/actions'
 
-    $: hasGovernanceTransactionInProgress =
-        $selectedAccount?.hasVotingPowerTransactionInProgress || $selectedAccount?.hasVotingTransactionInProgress
+    $: hasGovernanceTransactionInProgress = $selectedAccount?.processingGovernanceTransactionType !== null
 
     function onCancelClick(): void {
         closePopup()

diff --git a/packages/desktop/components/popups/VoteForProposalPopup.svelte b/packages/desktop/components/popups/VoteForProposalPopup.svelte
@@ -21,8 +21,7 @@
     )
     $: hasVotingPower = Number($selectedAccount?.votingPower) > 0
 
-    $: hasGovernanceTransactionInProgress =
-        $selectedAccount?.hasVotingPowerTransactionInProgress || $selectedAccount?.hasVotingTransactionInProgress
+    $: hasGovernanceTransactionInProgress = $selectedAccount?.processingGovernanceTransactionType !== null
 
     $: numberOfAbstainedQuestions =
         selectedAnswerValues?.filter((answerValue) => answerValue === ABSTAIN_VOTE_VALUE).length ?? 0

diff --git a/packages/desktop/components/popups/VotingPowerToZeroPopup.svelte b/packages/desktop/components/popups/VotingPowerToZeroPopup.svelte
@@ -12,8 +12,7 @@
 
     const ZERO_VOTING_POWER = '0'
 
-    $: isTransferring =
-        $selectedAccount?.hasVotingPowerTransactionInProgress || $selectedAccount?.hasVotingTransactionInProgress
+    $: isTransferring = $selectedAccount?.processingGovernanceTransactionType !== null
 
     function onCancelClick(): void {
         closePopup()
@@ -29,7 +28,7 @@
                     id: PopupId.ManageVotingPower,
                     props: { newVotingPower: ZERO_VOTING_POWER },
                 })
-                await setVotingPower(ZERO_VOTING_POWER, true)
+                await setVotingPower(ZERO_VOTING_POWER)
             })
         } catch (err) {
             handleError(err)

diff --git a/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte b/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
@@ -81,8 +81,7 @@
         !isProposalVotable($selectedProposal?.status) ||
         !hasChangedAnswers(selectedAnswerValues) ||
         hasSelectedNoAnswers(selectedAnswerValues)
-    $: hasGovernanceTransactionInProgress =
-        $selectedAccount?.hasVotingPowerTransactionInProgress || $selectedAccount?.hasVotingTransactionInProgress
+    $: hasGovernanceTransactionInProgress = $selectedAccount.processingGovernanceTransactionType !== null
     $: $selectedParticipationEventStatus, (textHintString = getTextHintString())
 
     function hasSelectedNoAnswers(_selectedAnswerValues: number[]): boolean {

diff --git a/packages/shared/components/VotingPower.svelte b/packages/shared/components/VotingPower.svelte
@@ -13,9 +13,7 @@
     $: formattedVotingPower = formatTokenAmountBestMatch(votingPower, asset?.metadata)
     $: formattedMaxVotingPower = formatTokenAmountBestMatch(maxVotingPower, asset?.metadata)
     $: hasTransactionInProgress =
-        $selectedAccount?.hasVotingPowerTransactionInProgress ||
-        $selectedAccount?.hasVotingTransactionInProgress ||
-        $selectedAccount?.isTransferring
+        $selectedAccount?.processingGovernanceTransactionType !== null || $selectedAccount?.isTransferring
 
     function handleManageVotingPower(): void {
         openPopup({

diff --git a/packages/shared/lib/contexts/governance/actions/setVotingPower.ts b/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
@@ -3,14 +3,18 @@ import { Transaction } from '@iota/wallet/out/types'
 import { selectedAccount, updateSelectedAccount } from '@core/account/stores'
 import { processAndAddToActivities } from '@core/wallet/utils'
 import { handleError } from '@core/error/handlers'
+import { GovernanceTransactionType } from '@contexts/governance/enums'
 
 export async function setVotingPower(rawAmount: string): Promise<void> {
     const account = get(selectedAccount)
     try {
         const votingPower = parseInt(account.votingPower, 10)
         const amount = parseInt(rawAmount, 10)
 
-        updateSelectedAccount({ hasVotingPowerTransactionInProgress: true, isTransferring: true })
+        updateSelectedAccount({
+            processingGovernanceTransactionType: GovernanceTransactionType.VotingPower,
+            isTransferring: true,
+        })
 
         let transaction: Transaction
         if (amount > votingPower) {
@@ -23,6 +27,9 @@ export async function setVotingPower(rawAmount: string): Promise<void> {
         await processAndAddToActivities(transaction, account)
     } catch (err) {
         handleError(err)
-        updateSelectedAccount({ hasVotingPowerTransactionInProgress: false, isTransferring: false })
+        updateSelectedAccount({
+            processingGovernanceTransactionType: GovernanceTransactionType.VotingPower,
+            isTransferring: false,
+        })
     }
 }
diff --git a/packages/shared/lib/contexts/governance/enums/governance-transaction-type.enum.ts b/packages/shared/lib/contexts/governance/enums/governance-transaction-type.enum.ts
@@ -0,0 +1,4 @@
+export enum GovernanceTransactionType {
+    VotingPower,
+    Vote,
+}
diff --git a/packages/shared/lib/contexts/governance/enums/index.ts b/packages/shared/lib/contexts/governance/enums/index.ts
@@ -1,3 +1,4 @@
+export * from './governance-transaction-type.enum'
 export * from './proposal-order-option.enum'
 export * from './proposal-status.enum'
 export * from './proposal-type.enum'
diff --git a/packages/shared/lib/core/account/actions/buildAccountState.ts b/packages/shared/lib/core/account/actions/buildAccountState.ts
@@ -36,6 +36,7 @@ export async function buildAccountState(account: IAccount, metadata: IAccountMet
         ...account,
         ...metadata,
         depositAddress,
+        processingGovernanceTransactionType: null,
         balances,
         isTransferring: false,
         votingPower,

diff --git a/...hared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts b/...hared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts
@@ -16,6 +16,7 @@ import { PopupId } from '@auxiliary/popup'
 import { activeAccounts, updateActiveAccount } from '@core/profile/stores'
 import { updateActiveAccountMetadata } from '@core/profile/actions'
 import { isAccountVoting } from '@contexts/governance/utils/isAccountVoting'
+import { GovernanceTransactionType } from '@contexts/governance/enums'
 
 export function handleTransactionInclusionEvent(error: Error, rawEvent: string): void {
     const { accountIndex, payload } = validateWalletApiEvent(error, rawEvent, WalletApiEvent.TransactionInclusion)
@@ -61,16 +62,16 @@ function handleGovernanceTransactionInclusionEvent(
         closePopup(true)
 
         const account = get(activeAccounts)?.find((_account) => _account.index === accountIndex)
-        if (account.hasVotingPowerTransactionInProgress) {
-            updateActiveAccount(accountIndex, { hasVotingPowerTransactionInProgress: false })
+        if (account.processingGovernanceTransactionType === GovernanceTransactionType.VotingPower) {
             if (isAccountVoting(accountIndex) && activity.votingPower !== 0) {
                 updateActiveAccountMetadata(accountIndex, { shouldRevote: true })
                 openPopup({ id: PopupId.Revote })
             }
         } else {
-            updateActiveAccount(accountIndex, { hasVotingTransactionInProgress: false })
             updateActiveAccountMetadata(accountIndex, { shouldRevote: false })
         }
+
+        updateActiveAccount(accountIndex, { processingGovernanceTransactionType: null })
         void updateParticipationOverview(accountIndex)
     }
     syncVotingPower(accountIndex)