From 3dc430a1b5abc4554019144216e64c0d04f60fce Mon Sep 17 00:00:00 2001
From: Abdelrhman Farag <85403429+aomafarag@users.noreply.github.com>
Date: Tue, 15 Nov 2022 10:42:43 +0100
Subject: [PATCH] fix: Show correct gross profit date when the callee is
 switched (#537)

---
 .../CollateralAuctionSwapTransactionTable.vue |  2 +-
 .../auction/collateral/TimeTillProfitable.vue | 29 +++++++++++++++----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/frontend/components/auction/collateral/CollateralAuctionSwapTransactionTable.vue b/frontend/components/auction/collateral/CollateralAuctionSwapTransactionTable.vue
index 7b4ee0820..03cbdecae 100644
--- a/frontend/components/auction/collateral/CollateralAuctionSwapTransactionTable.vue
+++ b/frontend/components/auction/collateral/CollateralAuctionSwapTransactionTable.vue
@@ -34,7 +34,7 @@
         <div class="flex w-full justify-between">
             <div>Estimated Profitability Time</div>
             <div class="RightInfo">
-                <time-till-profitable :auction="auctionTransaction" />
+                <TimeTillProfitable :auction="auctionTransaction" :market-id="currentMarketId" />
             </div>
         </div>
         <div class="flex w-full justify-between">
diff --git a/frontend/components/auction/collateral/TimeTillProfitable.vue b/frontend/components/auction/collateral/TimeTillProfitable.vue
index 49c5db724..1d6e9bf5c 100644
--- a/frontend/components/auction/collateral/TimeTillProfitable.vue
+++ b/frontend/components/auction/collateral/TimeTillProfitable.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
-        <div v-if="auction.transactionGrossProfitDate">
-            <time-till v-if="isProfitableBeforeEnding" :date="auction.transactionGrossProfitDate" />
+        <div v-if="transactionGrossProfitDate">
+            <time-till v-if="isProfitableBeforeEnding" :date="transactionGrossProfitDate" />
             <div v-else>Likely will not be profitable</div>
         </div>
         <div v-else-if="isAlreadyProfitable">Auction is profitable</div>
@@ -11,6 +11,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
+import BigNumber from 'bignumber.js';
 import { AuctionTransaction } from 'auctions-core/src/types';
 import TimeTill from '~/components/common/formatters/TimeTill.vue';
 
@@ -23,19 +24,35 @@ export default Vue.extend({
             type: Object as Vue.PropType<AuctionTransaction>,
             required: true,
         },
+        marketId: {
+            type: String,
+            default: '',
+        },
     },
     computed: {
+        transactionGrossProfitDate(): Date | undefined {
+            if (!this.marketId || !this.auction.marketDataRecords) {
+                return this.auction.transactionGrossProfitDate;
+            }
+            return this.auction.marketDataRecords[this.marketId].transactionGrossProfitDate;
+        },
+        marketUnitPrice(): BigNumber | undefined {
+            if (!this.marketId || !this.auction.marketDataRecords) {
+                return this.auction.marketUnitPrice;
+            }
+            return this.auction.marketDataRecords[this.marketId].marketUnitPrice;
+        },
         isProfitableBeforeEnding(): boolean {
-            if (!this.auction.transactionGrossProfitDate) {
+            if (!this.transactionGrossProfitDate) {
                 return false;
             }
-            return this.auction.endDate > this.auction.transactionGrossProfitDate;
+            return this.auction.endDate > this.transactionGrossProfitDate;
         },
         isAlreadyProfitable(): boolean {
-            if (!this.auction.marketUnitPrice) {
+            if (!this.marketUnitPrice) {
                 return false;
             }
-            return this.auction.approximateUnitPrice.isLessThan(this.auction.marketUnitPrice);
+            return this.auction.approximateUnitPrice.isLessThan(this.marketUnitPrice);
         },
     },
 });