From 5e0b629b48e7d6470f5f24362186f6ceb6da7fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Thu, 26 May 2022 14:38:32 +0200
Subject: [PATCH 1/3] fix: add missing event reactivity for right tx history
 categorization

---
 packages/shared/components/ActivityRow.svelte | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/shared/components/ActivityRow.svelte b/packages/shared/components/ActivityRow.svelte
index 1be5f849568..d48144ca1fb 100644
--- a/packages/shared/components/ActivityRow.svelte
+++ b/packages/shared/components/ActivityRow.svelte
@@ -1,9 +1,11 @@
 <script lang="typescript">
+    import { formatDate, localize } from '@core/i18n'
     import { Icon, Text } from 'shared/components'
     import { truncateString } from 'shared/lib/helpers'
-    import { formatDate, localize } from '@core/i18n'
-    import { Payload } from 'shared/lib/typings/message'
+    import { getMessageParticipationAction } from 'shared/lib/participation'
+    import { participationEvents } from 'shared/lib/participation/stores'
     import { ParticipationAction } from 'shared/lib/participation/types'
+    import { Payload, Transaction } from 'shared/lib/typings/message'
     import { formatUnitBestMatch } from 'shared/lib/units'
     import {
         findAccountWithAddress,
@@ -16,8 +18,6 @@
         sendAddressFromTransactionPayload,
         wallet,
     } from 'shared/lib/wallet'
-    import { Transaction } from 'shared/lib/typings/message'
-    import { getMessageParticipationAction } from 'shared/lib/participation'
 
     export let id: string
     export let timestamp: string
@@ -53,7 +53,9 @@
     $: hasCachedMigrationTx, milestonePayload, txPayload, (messageValue = getMessageValue())
     $: senderAddress = sendAddressFromTransactionPayload(payload)
     $: receiverAddresses = receiverAddressesFromTransactionPayload(payload)
-    $: participationAction = getMessageParticipationAction(id)
+
+    let participationAction: ParticipationAction
+    $: ($participationEvents, id), (participationAction = getMessageParticipationAction(id))
 
     // There can only be one sender address
     $: senderAccount = findAccountWithAddress(senderAddress)

From bcfc86499e29439c713e1dd9ddbb5457f325172b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Thu, 26 May 2022 14:54:35 +0200
Subject: [PATCH 2/3] fix: update getMessageParticipationAction logic to be
 based on vote & message dates

---
 packages/shared/components/ActivityRow.svelte    |  3 +--
 .../shared/lib/participation/participation.ts    | 16 ++++++++--------
 .../dashboard/wallet/views/AccountHistory.svelte |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/shared/components/ActivityRow.svelte b/packages/shared/components/ActivityRow.svelte
index d48144ca1fb..bb75e337c6e 100644
--- a/packages/shared/components/ActivityRow.svelte
+++ b/packages/shared/components/ActivityRow.svelte
@@ -3,7 +3,6 @@
     import { Icon, Text } from 'shared/components'
     import { truncateString } from 'shared/lib/helpers'
     import { getMessageParticipationAction } from 'shared/lib/participation'
-    import { participationEvents } from 'shared/lib/participation/stores'
     import { ParticipationAction } from 'shared/lib/participation/types'
     import { Payload, Transaction } from 'shared/lib/typings/message'
     import { formatUnitBestMatch } from 'shared/lib/units'
@@ -55,7 +54,7 @@
     $: receiverAddresses = receiverAddressesFromTransactionPayload(payload)
 
     let participationAction: ParticipationAction
-    $: ($participationEvents, id), (participationAction = getMessageParticipationAction(id))
+    $: participationAction = getMessageParticipationAction(id, timestamp)
 
     // There can only be one sender address
     $: senderAccount = findAccountWithAddress(senderAddress)
diff --git a/packages/shared/lib/participation/participation.ts b/packages/shared/lib/participation/participation.ts
index 8f1c0de1195..b39471acf1f 100644
--- a/packages/shared/lib/participation/participation.ts
+++ b/packages/shared/lib/participation/participation.ts
@@ -20,6 +20,7 @@ import {
     isFetchingParticipationInfo,
 } from './stores'
 import { AccountParticipationAbility, ParticipationAction, ParticipationEventState, StakingAirdrop } from './types'
+import { getDurationString, milestoneToDate } from '@lib/time'
 
 let shouldPollParticipation = true
 let participationPollTimeout
@@ -144,17 +145,16 @@ export const getAccountParticipationAbility = (account: WalletAccount): AccountP
  *
  * @returns {ParticipationAction}
  */
-export const getMessageParticipationAction = (messageId: string): ParticipationAction => {
+export const getMessageParticipationAction = (messageId: string, timestamp: string): ParticipationAction => {
     const matchedHistoryItem = get(participationHistory)?.find((item) => item.messageId === messageId)
     if (matchedHistoryItem?.action) {
         return matchedHistoryItem.action
     }
-    const stakingEndMilestoneIndexes = get(participationEvents)
-        ?.filter((event) => event.eventId === ASSEMBLY_EVENT_ID || event.eventId === SHIMMER_EVENT_ID)
-        ?.map((event) => event.information?.milestoneIndexEnd)
-    if (stakingEndMilestoneIndexes?.find((milestone) => milestone > LAST_MILESTONE_BEFORE_TREASURY_EVENT)) {
-        return ParticipationAction.Stake
-    } else if (stakingEndMilestoneIndexes?.length) {
-        return ParticipationAction.Vote
+    if (timestamp) {
+        const lastDateBeforeTreasuryEvent = milestoneToDate(LAST_MILESTONE_BEFORE_TREASURY_EVENT)
+        const messageDate = new Date(timestamp)
+        if (messageDate <= lastDateBeforeTreasuryEvent) {
+            return ParticipationAction.Stake
+        }
     }
 }
diff --git a/packages/shared/routes/dashboard/wallet/views/AccountHistory.svelte b/packages/shared/routes/dashboard/wallet/views/AccountHistory.svelte
index 82dd5b67bfc..f684bea6738 100644
--- a/packages/shared/routes/dashboard/wallet/views/AccountHistory.svelte
+++ b/packages/shared/routes/dashboard/wallet/views/AccountHistory.svelte
@@ -121,7 +121,7 @@
         if (searchValue) {
             queryTransactions = filteredTransactions.filter((transaction) => {
                 const transactionValue = (transaction?.payload as Transaction)?.data?.essence?.data?.value
-                const participationAction = getMessageParticipationAction(transaction.id)
+                const participationAction = getMessageParticipationAction(transaction.id, transaction.timestamp)
                 return (
                     sendAddressFromTransactionPayload(transaction?.payload) === searchValue ||
                     receiverAddressesFromTransactionPayload(transaction?.payload).find(

From 74178ed90d2289fca065555e2429dbb195e0f089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Thu, 26 May 2022 14:56:48 +0200
Subject: [PATCH 3/3] feat: remove unnecssary declaration

---
 packages/shared/components/ActivityRow.svelte | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/shared/components/ActivityRow.svelte b/packages/shared/components/ActivityRow.svelte
index bb75e337c6e..efed485bcde 100644
--- a/packages/shared/components/ActivityRow.svelte
+++ b/packages/shared/components/ActivityRow.svelte
@@ -52,8 +52,6 @@
     $: hasCachedMigrationTx, milestonePayload, txPayload, (messageValue = getMessageValue())
     $: senderAddress = sendAddressFromTransactionPayload(payload)
     $: receiverAddresses = receiverAddressesFromTransactionPayload(payload)
-
-    let participationAction: ParticipationAction
     $: participationAction = getMessageParticipationAction(id, timestamp)
 
     // There can only be one sender address