From d4eac0eb2a69a30ae002fa572f39d31fc9d71a0a Mon Sep 17 00:00:00 2001
From: evavirseda <evirseda@boxfish.studio>
Date: Wed, 3 Jan 2024 10:33:35 +0100
Subject: [PATCH 1/2] feat: display failed transtactions pill

---
 packages/shared/components/tiles/ActivityTile.svelte |  4 +++-
 .../tiles/tileFooters/AsyncActivityTileFooter.svelte | 12 +++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/shared/components/tiles/ActivityTile.svelte b/packages/shared/components/tiles/ActivityTile.svelte
index c16da516374..17dc4aee138 100644
--- a/packages/shared/components/tiles/ActivityTile.svelte
+++ b/packages/shared/components/tiles/ActivityTile.svelte
@@ -33,7 +33,9 @@
                 ? getTokenFromSelectedAccount(activity.assetId)
                 : undefined)
     $: isTimelocked = activity?.asyncData?.timelockDate > $time
-    $: shouldShowAsyncFooter = activity.asyncData && activity.asyncData.asyncStatus !== ActivityAsyncStatus.Claimed
+    $: shouldShowAsyncFooter =
+        (activity.asyncData && activity.asyncData.asyncStatus !== ActivityAsyncStatus.Claimed) ||
+        activity.inclusionState === InclusionState.Conflicting
 
     function onTransactionClick(): void {
         if (asset?.verification?.status === NotVerifiedStatus.New) {
diff --git a/packages/shared/components/tiles/tileFooters/AsyncActivityTileFooter.svelte b/packages/shared/components/tiles/tileFooters/AsyncActivityTileFooter.svelte
index 82c87f8da2b..595b22d7657 100644
--- a/packages/shared/components/tiles/tileFooters/AsyncActivityTileFooter.svelte
+++ b/packages/shared/components/tiles/tileFooters/AsyncActivityTileFooter.svelte
@@ -6,6 +6,7 @@
         rejectActivity,
         getTimeDifference,
         Activity,
+        InclusionState,
     } from '@core/wallet'
     import {
         ActivityAsyncStatusPill,
@@ -15,6 +16,7 @@
         TileFooter,
         FontWeight,
         ButtonSize,
+        ActivityInclusionStatusPill,
     } from 'shared/components'
     import { time } from '@core/app'
     import { Icon as IconEnum } from '@lib/auxiliary/icon'
@@ -110,7 +112,15 @@
                 {localize('actions.claim')}
             </Button>
         {:else}
-            <ActivityAsyncStatusPill asyncStatus={activity.asyncData?.asyncStatus} />
+            <pills-wrapper class="flex gap-2 flex-wrap shrink-0">
+                {#if activity?.inclusionState === InclusionState.Conflicting}
+                    <ActivityInclusionStatusPill
+                        inclusionState={activity.inclusionState}
+                        localizationKey="external.outgoing"
+                    />
+                {/if}
+                <ActivityAsyncStatusPill asyncStatus={activity.asyncData?.asyncStatus} />
+            </pills-wrapper>
         {/if}
     </svelte:fragment>
 </TileFooter>

From dcc39270acf843d140aab63a7e95107594818a48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= <balvarez@boxfish.studio>
Date: Thu, 25 Jan 2024 18:03:20 +0100
Subject: [PATCH 2/2] fix: conflicting pill in tx

---
 .../components/tiles/ActivityTile.svelte      | 21 ++++++++++++++-----
 .../AsyncActivityTileFooter.svelte            | 12 +----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/packages/shared/components/tiles/ActivityTile.svelte b/packages/shared/components/tiles/ActivityTile.svelte
index 17dc4aee138..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,10 +34,10 @@
             activity.type === ActivityType.Basic || activity.type === ActivityType.Foundry
                 ? getTokenFromSelectedAccount(activity.assetId)
                 : undefined)
-    $: isTimelocked = activity?.asyncData?.timelockDate > $time
+    $: isConflicting = activity.inclusionState === InclusionState.Conflicting
+    $: isTimelocked = !isConflicting && activity?.asyncData?.timelockDate > $time
     $: shouldShowAsyncFooter =
-        (activity.asyncData && activity.asyncData.asyncStatus !== ActivityAsyncStatus.Claimed) ||
-        activity.inclusionState === InclusionState.Conflicting
+        !isConflicting && activity.asyncData && activity.asyncData.asyncStatus !== ActivityAsyncStatus.Claimed
 
     function onTransactionClick(): void {
         if (asset?.verification?.status === NotVerifiedStatus.New) {
@@ -78,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} />
diff --git a/packages/shared/components/tiles/tileFooters/AsyncActivityTileFooter.svelte b/packages/shared/components/tiles/tileFooters/AsyncActivityTileFooter.svelte
index 595b22d7657..82c87f8da2b 100644
--- a/packages/shared/components/tiles/tileFooters/AsyncActivityTileFooter.svelte
+++ b/packages/shared/components/tiles/tileFooters/AsyncActivityTileFooter.svelte
@@ -6,7 +6,6 @@
         rejectActivity,
         getTimeDifference,
         Activity,
-        InclusionState,
     } from '@core/wallet'
     import {
         ActivityAsyncStatusPill,
@@ -16,7 +15,6 @@
         TileFooter,
         FontWeight,
         ButtonSize,
-        ActivityInclusionStatusPill,
     } from 'shared/components'
     import { time } from '@core/app'
     import { Icon as IconEnum } from '@lib/auxiliary/icon'
@@ -112,15 +110,7 @@
                 {localize('actions.claim')}
             </Button>
         {:else}
-            <pills-wrapper class="flex gap-2 flex-wrap shrink-0">
-                {#if activity?.inclusionState === InclusionState.Conflicting}
-                    <ActivityInclusionStatusPill
-                        inclusionState={activity.inclusionState}
-                        localizationKey="external.outgoing"
-                    />
-                {/if}
-                <ActivityAsyncStatusPill asyncStatus={activity.asyncData?.asyncStatus} />
-            </pills-wrapper>
+            <ActivityAsyncStatusPill asyncStatus={activity.asyncData?.asyncStatus} />
         {/if}
     </svelte:fragment>
 </TileFooter>