From b7c917a82562c1e627da5497bca9a99f828f1ccc Mon Sep 17 00:00:00 2001
From: Abdelrhman Farag <aomafarag@gmail.com>
Date: Wed, 21 Sep 2022 12:01:26 +0200
Subject: [PATCH 1/7] Add separate auction state component, and adjust other
 related components accordingly

---
 .../SurplusAuctionBidTransactionTable.vue     | 10 +++---
 .../surplus/SurplusAuctionState.stories.js    | 22 +++++++++++++
 .../auction/surplus/SurplusAuctionState.vue   | 32 +++++++++++++++++++
 .../auction/surplus/SurplusAuctionsTable.vue  | 12 +++----
 4 files changed, 64 insertions(+), 12 deletions(-)
 create mode 100644 frontend/components/auction/surplus/SurplusAuctionState.stories.js
 create mode 100644 frontend/components/auction/surplus/SurplusAuctionState.vue

diff --git a/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue b/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue
index 251356cb6..23f3c5f60 100644
--- a/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue
+++ b/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue
@@ -3,7 +3,7 @@
         <div class="flex justify-between">
             <div>Auction State</div>
             <div>
-                <time-till :date="auction.auctionEndDate" />
+                <SurplusAuctionState :state="auction.state" :end-date="auction.auctionEndDate" />
             </div>
         </div>
         <div class="flex justify-between">
@@ -82,16 +82,16 @@
 </template>
 
 <script lang="ts">
-import type { SurplusAuction } from 'auctions-core/src/types';
 import Vue from 'vue';
 import BigNumber from 'bignumber.js';
-import BidInput from '../../common/inputs/BidInput.vue';
-import TimeTill from '~/components/common/formatters/TimeTill.vue';
+import type { SurplusAuction } from 'auctions-core/src/types';
+import SurplusAuctionState from '~/components/auction/surplus/SurplusAuctionState.vue';
+import BidInput from '~/components/common/inputs/BidInput.vue';
 import FormatCurrency from '~/components/common/formatters/FormatCurrency.vue';
 
 export default Vue.extend({
     components: {
-        TimeTill,
+        SurplusAuctionState,
         FormatCurrency,
         BidInput,
     },
diff --git a/frontend/components/auction/surplus/SurplusAuctionState.stories.js b/frontend/components/auction/surplus/SurplusAuctionState.stories.js
new file mode 100644
index 000000000..74e76752c
--- /dev/null
+++ b/frontend/components/auction/surplus/SurplusAuctionState.stories.js
@@ -0,0 +1,22 @@
+import { storiesOf } from '@storybook/vue';
+import faker from 'faker';
+import SurplusAuctionState from './SurplusAuctionState';
+
+const common = {
+    components: { SurplusAuctionState },
+    data: () => ({
+        state: faker.helpers.randomize([
+            'just-started',
+            'have-bids',
+            'ready-for-collection',
+            'requires-restart',
+            'collected',
+        ]),
+        endDate: new Date(faker.date.recent()),
+    }),
+};
+
+storiesOf('Auction/Surplus/SurplusAuctionState', module).add('Default', () => ({
+    ...common,
+    template: '<SurplusAuctionState :state="state" :end-date="endDate" />',
+}));
diff --git a/frontend/components/auction/surplus/SurplusAuctionState.vue b/frontend/components/auction/surplus/SurplusAuctionState.vue
new file mode 100644
index 000000000..f91c789b8
--- /dev/null
+++ b/frontend/components/auction/surplus/SurplusAuctionState.vue
@@ -0,0 +1,32 @@
+<template>
+    <div>
+        <span v-if="state === 'collected'"> Collected </span>
+        <span v-else-if="state === 'requires-restart'"> Requires Restart </span>
+        <span v-else-if="state === 'ready-for-collection'"> Collectable since </span>
+        <span v-else> Expires in </span>
+        <TimeTill v-if="state !== 'requires-restart'" :date="endDate" />
+    </div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { SurplusAuctionStates } from 'auctions-core/src/types';
+import TimeTill from '~/components/common/formatters/TimeTill.vue';
+
+export default Vue.extend({
+    name: 'SurplusAuctionState',
+    components: {
+        TimeTill,
+    },
+    props: {
+        state: {
+            type: String as Vue.PropType<SurplusAuctionStates>,
+            required: true,
+        },
+        endDate: {
+            type: Date,
+            required: true,
+        },
+    },
+});
+</script>
diff --git a/frontend/components/auction/surplus/SurplusAuctionsTable.vue b/frontend/components/auction/surplus/SurplusAuctionsTable.vue
index 3f8365c74..5ece97514 100644
--- a/frontend/components/auction/surplus/SurplusAuctionsTable.vue
+++ b/frontend/components/auction/surplus/SurplusAuctionsTable.vue
@@ -41,11 +41,7 @@
                 <span v-else class="opacity-50">Unknown</span>
             </div>
             <div slot="state" slot-scope="state, record">
-                <span v-if="state === 'collected'"> Collected </span>
-                <span v-else-if="state === 'requires-restart'"> Requires Restart </span>
-                <span v-else-if="state === 'ready-for-collection'"> Collectable since </span>
-                <span v-else> Expires in </span>
-                <time-till v-if="state !== 'requires-restart'" :date="record.earliestEndDate" />
+                <SurplusAuctionState :state="state" :end-date="record.earliestEndDate" />
             </div>
             <div slot="updatingStatus" class="opacity-50 font-normal">
                 <div v-if="isLoading" class="flex items-center space-x-2">
@@ -76,13 +72,14 @@
 <script lang="ts">
 import Vue, { PropType } from 'vue';
 import { Table } from 'ant-design-vue';
-import { SurplusAuctionTransaction } from 'auctions-core/src/types';
 import { compareAsc } from 'date-fns';
+import { SurplusAuctionTransaction } from 'auctions-core/src/types';
+import LoadingIcon from '~/assets/icons/loading.svg';
+import SurplusAuctionState from '~/components/auction/surplus/SurplusAuctionState.vue';
 import Loading from '~/components/common/other/Loading.vue';
 import TimeTill from '~/components/common/formatters/TimeTill.vue';
 import FormatMarketValue from '~/components/common/formatters/FormatMarketValue.vue';
 import FormatCurrency from '~/components/common/formatters/FormatCurrency.vue';
-import LoadingIcon from '~/assets/icons/loading.svg';
 
 const compareBy = function (field: string, cmp: Function = (a: number, b: number): number => a - b): Function {
     return (aAuction: any, bAuction: any, sortOrder: string) => {
@@ -145,6 +142,7 @@ const STATES_FILTERS: { text: string; value: string }[] = [
 export default Vue.extend({
     name: 'SurplusAuctionsTable',
     components: {
+        SurplusAuctionState,
         Loading,
         Table,
         TimeTill,

From e3b24b7aa8cd083bf1cf1129d99d175356bf1953 Mon Sep 17 00:00:00 2001
From: Abdelrhman Farag <aomafarag@gmail.com>
Date: Wed, 21 Sep 2022 12:39:25 +0200
Subject: [PATCH 2/7] Change to earliestEndDate

---
 .../auction/surplus/SurplusAuctionBidTransactionTable.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue b/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue
index 23f3c5f60..987e6280a 100644
--- a/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue
+++ b/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue
@@ -3,7 +3,7 @@
         <div class="flex justify-between">
             <div>Auction State</div>
             <div>
-                <SurplusAuctionState :state="auction.state" :end-date="auction.auctionEndDate" />
+                <SurplusAuctionState :state="auction.state" :end-date="auction.earliestEndDate" />
             </div>
         </div>
         <div class="flex justify-between">

From 3a941fe50596c3ef8be795eff4ab824a87aabf51 Mon Sep 17 00:00:00 2001
From: Abdelrhman Farag <aomafarag@gmail.com>
Date: Wed, 21 Sep 2022 14:07:39 +0200
Subject: [PATCH 3/7] Set auction prop to correct type

---
 .../auction/surplus/SurplusAuctionBidTransactionTable.vue     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue b/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue
index 987e6280a..e7ab852f1 100644
--- a/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue
+++ b/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue
@@ -84,7 +84,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import BigNumber from 'bignumber.js';
-import type { SurplusAuction } from 'auctions-core/src/types';
+import type { SurplusAuctionTransaction } from 'auctions-core/src/types';
 import SurplusAuctionState from '~/components/auction/surplus/SurplusAuctionState.vue';
 import BidInput from '~/components/common/inputs/BidInput.vue';
 import FormatCurrency from '~/components/common/formatters/FormatCurrency.vue';
@@ -97,7 +97,7 @@ export default Vue.extend({
     },
     props: {
         auction: {
-            type: Object as Vue.PropType<SurplusAuction>,
+            type: Object as Vue.PropType<SurplusAuctionTransaction>,
             required: true,
         },
     },

From f8c5025a609219116be92fa36885d785ba59773d Mon Sep 17 00:00:00 2001
From: Abdelrhman Farag <aomafarag@gmail.com>
Date: Wed, 21 Sep 2022 15:37:08 +0200
Subject: [PATCH 4/7] Fix endDate type

---
 core/package.json                                           | 2 +-
 frontend/components/auction/surplus/SurplusAuctionState.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/package.json b/core/package.json
index ff0e62705..21b82e7c6 100644
--- a/core/package.json
+++ b/core/package.json
@@ -9,7 +9,7 @@
     "start": "node .",
     "test": "npx hardhat test --network testnetwork --config local.hardhat.config.ts",
     "lint": "eslint --ext \".js,.ts\" --ignore-path .gitignore . --max-warnings=0",
-    "hardhat:silent": "npx hardhat node 1>&/dev/null",
+    "hardhat:silent": "npx hardhat node &> /dev/null",
     "hardhat": "npx hardhat node",
     "hardhat:simulations": "npx hardhat --network testnetwork --config local.hardhat.config.ts run ./simulations/index.ts",
     "simulate": "npm-run-all --parallel hardhat:silent hardhat:simulations"
diff --git a/frontend/components/auction/surplus/SurplusAuctionState.vue b/frontend/components/auction/surplus/SurplusAuctionState.vue
index f91c789b8..ea1051a1f 100644
--- a/frontend/components/auction/surplus/SurplusAuctionState.vue
+++ b/frontend/components/auction/surplus/SurplusAuctionState.vue
@@ -24,8 +24,8 @@ export default Vue.extend({
             required: true,
         },
         endDate: {
-            type: Date,
-            required: true,
+            type: [String, Number, Date],
+            default: '',
         },
     },
 });

From 766fcd0a6367813e074daea916b30569d6c9a5c4 Mon Sep 17 00:00:00 2001
From: Abdelrhman Farag <aomafarag@gmail.com>
Date: Wed, 21 Sep 2022 18:24:56 +0200
Subject: [PATCH 5/7] Handle nextMinimumBid.isZero() case

---
 core/src/surplus.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/surplus.ts b/core/src/surplus.ts
index 1958d73df..19bc7d53f 100644
--- a/core/src/surplus.ts
+++ b/core/src/surplus.ts
@@ -205,11 +205,14 @@ export const enrichSurplusAuction = async (
     network: string,
     auction: SurplusAuctionActive
 ): Promise<SurplusAuctionTransaction> => {
-    const nextMinimumBid = await getNextMinimumBid(network, auction);
+    let nextMinimumBid = await getNextMinimumBid(network, auction);
     const unitPrice = auction.bidAmountMKR.div(auction.receiveAmountDAI);
     const marketUnitPrice = await getMarketPriceMkr(network, auction.bidAmountMKR);
     const marketUnitPriceToUnitPriceRatio = unitPrice.minus(marketUnitPrice).dividedBy(marketUnitPrice);
     const fees = await getSurplusTransactionFees(network);
+    if (nextMinimumBid.isZero()) {
+        nextMinimumBid = new BigNumber(1000).plus(fees.combinedBidFeesDai).div(marketUnitPrice);
+    }
     return {
         ...auction,
         ...fees,

From b51880585e556b8e77f360a6b1e04d7cb662158c Mon Sep 17 00:00:00 2001
From: Abdelrhman Farag <aomafarag@gmail.com>
Date: Thu, 22 Sep 2022 12:56:36 +0200
Subject: [PATCH 6/7] Update to new state component and switch to transaction

---
 .../components/auction/surplus/SurplusAuction.vue     | 11 +++--------
 .../surplus/SurplusAuctionBidTransactionTable.vue     |  4 ++--
 .../auction/surplus/SurplusAuctionState.vue           |  2 +-
 .../auction/surplus/SurplusAuctionTransactionFlow.vue |  4 ++--
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/frontend/components/auction/surplus/SurplusAuction.vue b/frontend/components/auction/surplus/SurplusAuction.vue
index 28486f55e..e050efb46 100644
--- a/frontend/components/auction/surplus/SurplusAuction.vue
+++ b/frontend/components/auction/surplus/SurplusAuction.vue
@@ -27,14 +27,7 @@
                         <tr>
                             <td>Auction State</td>
                             <td>
-                                <span v-if="isActive">Ends in </span>
-                                <span v-else-if="requiresRestart">Requires restart</span>
-                                <span v-else-if="auction.state === 'ready-for-collection'">Ended </span>
-                                <span v-else>Collected </span>
-                                <time-till
-                                    v-if="auction.earliestEndDate && !requiresRestart"
-                                    :date="auction.earliestEndDate"
-                                />
+                                <SurplusAuctionState :state="auction.state" :end-date="auction.earliestEndDate" />
                             </td>
                         </tr>
                         <tr>
@@ -148,6 +141,7 @@
 import Vue from 'vue';
 import type { CompensationAuctionActionStates, SurplusAuctionTransaction } from 'auctions-core/src/types';
 import { Alert, Tooltip } from 'ant-design-vue';
+import SurplusAuctionState from '~/components/auction/surplus/SurplusAuctionState.vue';
 import TextBlock from '~/components/common/other/TextBlock.vue';
 import TimeTill from '~/components/common/formatters/TimeTill.vue';
 import Button from '~/components/common/inputs/BaseButton.vue';
@@ -161,6 +155,7 @@ export default Vue.extend({
     name: 'SurplusAuction',
     components: {
         AuctionRestartPanel,
+        SurplusAuctionState,
         FormatCurrency,
         TextBlock,
         TimeTill,
diff --git a/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue b/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue
index e7ab852f1..3e0a04e3c 100644
--- a/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue
+++ b/frontend/components/auction/surplus/SurplusAuctionBidTransactionTable.vue
@@ -57,7 +57,7 @@
         <div class="flex justify-between">
             <div>Price on Uniswap</div>
             <div>
-                <format-currency
+                <FormatCurrency
                     v-if="auction.marketUnitPrice && isActive"
                     :value="auction.marketUnitPrice"
                     :decimal-places="6"
@@ -69,7 +69,7 @@
         <div class="flex justify-between font-bold">
             <div>Price after the bid</div>
             <div>
-                <format-currency
+                <FormatCurrency
                     v-if="unitPriceAfterBid && isActive && !isBidAmountNaN"
                     :value="unitPriceAfterBid"
                     :decimal-places="6"
diff --git a/frontend/components/auction/surplus/SurplusAuctionState.vue b/frontend/components/auction/surplus/SurplusAuctionState.vue
index ea1051a1f..560448816 100644
--- a/frontend/components/auction/surplus/SurplusAuctionState.vue
+++ b/frontend/components/auction/surplus/SurplusAuctionState.vue
@@ -3,7 +3,7 @@
         <span v-if="state === 'collected'"> Collected </span>
         <span v-else-if="state === 'requires-restart'"> Requires Restart </span>
         <span v-else-if="state === 'ready-for-collection'"> Collectable since </span>
-        <span v-else> Expires in </span>
+        <span v-else> Ends in </span>
         <TimeTill v-if="state !== 'requires-restart'" :date="endDate" />
     </div>
 </template>
diff --git a/frontend/components/auction/surplus/SurplusAuctionTransactionFlow.vue b/frontend/components/auction/surplus/SurplusAuctionTransactionFlow.vue
index d57668423..896a9cd0d 100644
--- a/frontend/components/auction/surplus/SurplusAuctionTransactionFlow.vue
+++ b/frontend/components/auction/surplus/SurplusAuctionTransactionFlow.vue
@@ -84,7 +84,7 @@
 </template>
 
 <script lang="ts">
-import type { SurplusAuction } from 'auctions-core/src/types';
+import type { SurplusAuctionTransaction } from 'auctions-core/src/types';
 import Vue from 'vue';
 import { Alert } from 'ant-design-vue';
 import BigNumber from 'bignumber.js';
@@ -112,7 +112,7 @@ export default Vue.extend({
     },
     props: {
         auction: {
-            type: Object as Vue.PropType<SurplusAuction>,
+            type: Object as Vue.PropType<SurplusAuctionTransaction>,
             required: true,
         },
         auctionActionState: {

From 389943654aeaf6dafc26f53f85debdb98025bbcf Mon Sep 17 00:00:00 2001
From: Abdelrhman Farag <aomafarag@gmail.com>
Date: Thu, 22 Sep 2022 17:50:24 +0200
Subject: [PATCH 7/7] Fetch price on Uniswap if there are no bids

---
 core/src/surplus.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/surplus.ts b/core/src/surplus.ts
index 19bc7d53f..15ea8499c 100644
--- a/core/src/surplus.ts
+++ b/core/src/surplus.ts
@@ -207,12 +207,15 @@ export const enrichSurplusAuction = async (
 ): Promise<SurplusAuctionTransaction> => {
     let nextMinimumBid = await getNextMinimumBid(network, auction);
     const unitPrice = auction.bidAmountMKR.div(auction.receiveAmountDAI);
-    const marketUnitPrice = await getMarketPriceMkr(network, auction.bidAmountMKR);
+    let marketUnitPrice = await getMarketPriceMkr(network, auction.bidAmountMKR);
     const marketUnitPriceToUnitPriceRatio = unitPrice.minus(marketUnitPrice).dividedBy(marketUnitPrice);
     const fees = await getSurplusTransactionFees(network);
     if (nextMinimumBid.isZero()) {
         nextMinimumBid = new BigNumber(1000).plus(fees.combinedBidFeesDai).div(marketUnitPrice);
     }
+    if (marketUnitPrice.isNaN()) {
+        marketUnitPrice = await convertMkrToDai(network, new BigNumber(1));
+    }
     return {
         ...auction,
         ...fees,