From c523b02e0832470b7519a6071fceff8bf9cb5b72 Mon Sep 17 00:00:00 2001
From: evavirseda <evirseda@boxfish.studio>
Date: Thu, 25 Jan 2024 18:05:46 +0100
Subject: [PATCH] feat: display the proper pill for failed transactions (#7889)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: display failed transtactions pill

* fix: conflicting pill in tx

---------

Co-authored-by: Begoña Álvarez de la Cruz <balvarez@boxfish.studio>
---
 .../components/tiles/ActivityTile.svelte      | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/packages/shared/components/tiles/ActivityTile.svelte b/packages/shared/components/tiles/ActivityTile.svelte
index c16da516374..83eab9e5596 100644
--- a/packages/shared/components/tiles/ActivityTile.svelte
+++ b/packages/shared/components/tiles/ActivityTile.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { PopupId, openPopup } from '@auxiliary/popup'
     import { time } from '@core/app'
     import {
         Activity,
@@ -11,6 +12,7 @@
         selectedAccountAssets,
     } from '@core/wallet'
     import {
+        ActivityInclusionStatusPill,
         AliasActivityTileContent,
         AsyncActivityTileFooter,
         ClickableTile,
@@ -18,11 +20,11 @@
         FoundryActivityTileContent,
         GovernanceActivityTileContent,
         NftActivityTileContent,
+        TileFooter,
         TimelockActivityTileFooter,
         TransactionActivityTileContent,
         VestingActivityTileContent,
     } from 'shared/components'
-    import { PopupId, openPopup } from '@auxiliary/popup'
 
     export let activity: Activity
 
@@ -32,8 +34,10 @@
             activity.type === ActivityType.Basic || activity.type === ActivityType.Foundry
                 ? getTokenFromSelectedAccount(activity.assetId)
                 : undefined)
-    $: isTimelocked = activity?.asyncData?.timelockDate > $time
-    $: shouldShowAsyncFooter = activity.asyncData && activity.asyncData.asyncStatus !== ActivityAsyncStatus.Claimed
+    $: isConflicting = activity.inclusionState === InclusionState.Conflicting
+    $: isTimelocked = !isConflicting && activity?.asyncData?.timelockDate > $time
+    $: shouldShowAsyncFooter =
+        !isConflicting && activity.asyncData && activity.asyncData.asyncStatus !== ActivityAsyncStatus.Claimed
 
     function onTransactionClick(): void {
         if (asset?.verification?.status === NotVerifiedStatus.New) {
@@ -76,7 +80,16 @@
                 <FoundryActivityTileContent {activity} />
             {/if}
         </tile-content>
-        {#if isTimelocked}
+        {#if isConflicting}
+            <TileFooter>
+                <svelte:fragment slot="right">
+                    <ActivityInclusionStatusPill
+                        inclusionState={activity.inclusionState}
+                        localizationKey="external.outgoing"
+                    />
+                </svelte:fragment>
+            </TileFooter>
+        {:else if isTimelocked}
             <TimelockActivityTileFooter {activity} />
         {:else if shouldShowAsyncFooter}
             <AsyncActivityTileFooter {activity} />