From c5f064aa93eee1ce2d361ad4cc69edcbc81747bf Mon Sep 17 00:00:00 2001
From: Matthew Maxwell <44885822+maxwellmattryan@users.noreply.github.com>
Date: Wed, 1 Feb 2023 10:56:22 -0600
Subject: [PATCH] fix: reset Governance dashboard on wallet switch (#5737)

* fix: add account switching for proposal details view

* chore: rename some components

* fix: allow switching on dashboard view

* chore: add explanatory comments

* chore: apply changes per PR review
---
 .../views/dashboard/collectibles/Collectibles.svelte |  4 ++--
 .../views/dashboard/governance/Governance.svelte     | 12 +++++++-----
 ...alsView.svelte => GovernanceDashboardView.svelte} |  7 ++++---
 ...DetailsView.svelte => ProposalDetailsView.svelte} | 10 +++++++---
 .../views/dashboard/governance/views/index.js        |  4 ++--
 5 files changed, 22 insertions(+), 15 deletions(-)
 rename packages/desktop/views/dashboard/governance/views/{ProposalsView.svelte => GovernanceDashboardView.svelte} (92%)
 rename packages/desktop/views/dashboard/governance/views/{DetailsView.svelte => ProposalDetailsView.svelte} (97%)

diff --git a/packages/desktop/views/dashboard/collectibles/Collectibles.svelte b/packages/desktop/views/dashboard/collectibles/Collectibles.svelte
index 19329159f07..8311e38c55e 100644
--- a/packages/desktop/views/dashboard/collectibles/Collectibles.svelte
+++ b/packages/desktop/views/dashboard/collectibles/Collectibles.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
     import { CollectiblesDetailsView, CollectiblesGalleryView } from './views'
-    import { selectedAccountIndex } from '@core/account/stores/selected-account-id.store'
+    import { selectedAccountIndex } from '@core/account/stores'
     import { collectiblesRoute, CollectiblesRoute, collectiblesRouter } from '@core/router'
 
-    $: $selectedAccountIndex && $collectiblesRouter.reset()
+    $: $selectedAccountIndex !== undefined && $collectiblesRouter.reset()
 </script>
 
 <div class="w-full h-full flex flex-col flex-nowrap p-8 relative flex-1 bg-gray-50 dark:bg-gray-900">
diff --git a/packages/desktop/views/dashboard/governance/Governance.svelte b/packages/desktop/views/dashboard/governance/Governance.svelte
index f12e1e8eabc..0aae639c607 100644
--- a/packages/desktop/views/dashboard/governance/Governance.svelte
+++ b/packages/desktop/views/dashboard/governance/Governance.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
-    import { DetailsView, ProposalsView } from './views'
-    import { selectedAccount } from '@core/account'
-    import { GovernanceRoute, governanceRoute } from '@core/router'
+    import { GovernanceDashboardView, ProposalDetailsView } from './views'
+    import { selectedAccount, selectedAccountIndex } from '@core/account/stores'
+    import { GovernanceRoute, governanceRoute, governanceRouter } from '@core/router'
+
+    $: $selectedAccountIndex !== undefined && $governanceRouter.reset()
 </script>
 
 {#if $selectedAccount}
     {#if $governanceRoute === GovernanceRoute.Proposals}
-        <ProposalsView />
+        <GovernanceDashboardView />
     {:else if $governanceRoute === GovernanceRoute.Details}
-        <DetailsView />
+        <ProposalDetailsView />
     {/if}
 {/if}
diff --git a/packages/desktop/views/dashboard/governance/views/ProposalsView.svelte b/packages/desktop/views/dashboard/governance/views/GovernanceDashboardView.svelte
similarity index 92%
rename from packages/desktop/views/dashboard/governance/views/ProposalsView.svelte
rename to packages/desktop/views/dashboard/governance/views/GovernanceDashboardView.svelte
index 5ebb11ba824..8ed750ad046 100644
--- a/packages/desktop/views/dashboard/governance/views/ProposalsView.svelte
+++ b/packages/desktop/views/dashboard/governance/views/GovernanceDashboardView.svelte
@@ -10,13 +10,14 @@
         FontWeight,
         Button,
     } from '@ui'
+    import { openPopup } from '@auxiliary/popup'
+    import { selectedAccountIndex } from '@core/account/stores'
+    import { localize } from '@core/i18n'
     import { registeredEventIds } from '@contexts/governance/stores'
     import { createProposals } from '@contexts/governance/utils'
-    import { localize } from '@core/i18n'
-    import { openPopup } from '@auxiliary/popup'
 
     let promise = createProposals()
-    $: $registeredEventIds, (promise = createProposals())
+    $: $selectedAccountIndex, $registeredEventIds, (promise = createProposals())
 
     function handleAddProposal(): void {
         openPopup({
diff --git a/packages/desktop/views/dashboard/governance/views/DetailsView.svelte b/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
similarity index 97%
rename from packages/desktop/views/dashboard/governance/views/DetailsView.svelte
rename to packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
index 3444c77bdb8..96733e22cb7 100644
--- a/packages/desktop/views/dashboard/governance/views/DetailsView.svelte
+++ b/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
@@ -106,10 +106,14 @@
 
     async function setVotingEventPayload(eventId: string): Promise<void> {
         const event = await getVotingEvent(eventId)
-        if (event?.data?.payload?.type === ParticipationEventType.Voting) {
-            votingPayload = event.data.payload
+        if (event) {
+            if (event.data?.payload?.type === ParticipationEventType.Voting) {
+                votingPayload = event.data.payload
+            } else {
+                throw new Error('Event is a staking event')
+            }
         } else {
-            throw new Error('Event is a staking event!')
+            throw new Error('Event not found')
         }
     }
 
diff --git a/packages/desktop/views/dashboard/governance/views/index.js b/packages/desktop/views/dashboard/governance/views/index.js
index 39a1c735d51..678c6dbc5ef 100644
--- a/packages/desktop/views/dashboard/governance/views/index.js
+++ b/packages/desktop/views/dashboard/governance/views/index.js
@@ -1,2 +1,2 @@
-export { default as DetailsView } from './DetailsView.svelte'
-export { default as ProposalsView } from './ProposalsView.svelte'
+export { default as GovernanceDashboardView } from './GovernanceDashboardView.svelte'
+export { default as ProposalDetailsView } from './ProposalDetailsView.svelte'