fix: handle partial cancellations in the timeline (#127)

Author: smbdy

package.json

@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@bgd-labs/aave-address-book": "^4.17.2",
-    "@bgd-labs/aave-governance-ui-helpers": "^3.5.1",
+    "@bgd-labs/aave-governance-ui-helpers": "^3.6.0",
     "@bgd-labs/frontend-web3-utils": "^1.3.1",
     "@bgd-labs/react-web3-icons": "^1.13.0",
     "@emotion/cache": "^11.13.1",

src/proposals/components/timeline/Timeline.tsx

@@ -36,6 +36,7 @@ export function Timeline({ proposal, loading }: TimelineProps) {
     lastPayloadExpiredAt,
     lastPayloadExecutedAt,
     lastPayloadQueuedAt,
+    allPayloadsCanceled,
   } = getProposalStepsAndAmounts({
     proposalData: proposal.data,
     quorum: proposal.config.quorum,
@@ -79,10 +80,12 @@ export function Timeline({ proposal, loading }: TimelineProps) {
       ? votingClosedTimestamp
       : undefined;
 
-  const canceledTimestamp =
-    lastPayloadCanceledAt > proposal.data.canceledAt
-      ? lastPayloadCanceledAt
-      : proposal.data.canceledAt;
+  let canceledTimestamp;
+  if (allPayloadsCanceled) {
+    canceledTimestamp = lastPayloadCanceledAt;
+  } else if (proposal.data.canceledAt > 0) {
+    canceledTimestamp = proposal.data.canceledAt;
+  }
 
   const state =
     proposalStatuses.find((s) => s.value === proposal?.combineState)?.title ||

yarn.lock

@@ -902,10 +902,10 @@
   resolved "https://registry.yarnpkg.com/@bgd-labs/aave-address-book/-/aave-address-book-4.17.2.tgz#976823b4c825aeda33bd9375705260aef857c88c"
   integrity sha512-UVVCaLlLBA5VHl+qip/9qH8yZnNyIvyeRd4nHgKAluNbjeyRPzqESqToGmWSvtWOYK2kUtOrWCu0z9ncq6t6IA==
 
-"@bgd-labs/aave-governance-ui-helpers@^3.5.1":
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/@bgd-labs/aave-governance-ui-helpers/-/aave-governance-ui-helpers-3.5.1.tgz#782bda339fd80352f725899b905f5d0e77c9dd7e"
-  integrity sha512-d2/RHiAM8fLN9iPqS8ai7x/ByhD+48niGHkpau2MRp4DDQYYwH4nqu4j5leKWpkWqUJ4IaLuzt8r8wBosShdxw==
+"@bgd-labs/aave-governance-ui-helpers@^3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@bgd-labs/aave-governance-ui-helpers/-/aave-governance-ui-helpers-3.6.0.tgz#7f13470c4f2e3c0d58d32e1bcd3be66e20403e9a"
+  integrity sha512-jqvCp11icvFgEWOEdmNh1mqWHGgu/v3WiGmMEhDf0CCXjwwdZvGMh+yjHw5FlZEgTGQx6L9/5jaAkpQG5k0mng==
   dependencies:
     abitype "^1.0.8"
     bs58 "^6.0.0"