post-order line draw improvements

src/blockchain/contract.js

@@ -31,7 +31,7 @@ export async function queryHelperContract(helper, provider) {
 // use newContract(addr, 'IVaultImpl', provider, 'IVault') to get the ABI from IVault.sol/IVaultImpl.json
 export async function newContract(addr, name, provider) {
     const abi = await abiCache.get(name)
-    console.log(`${name} ABI`, abi)
+    // console.log(`${name} ABI`, abi)
     return new ethers.Contract(addr, abi, provider)
 }
 

src/blockchain/orderlib.js

@@ -1,5 +1,6 @@
 import {uint32max, uint64max} from "@/misc.js";
 import {decodeIEE754, encodeIEE754} from "@/common.js";
+import order from "@/components/Order.vue";
 
 export const MAX_FRACTION = 65535;
 export const NO_CONDITIONAL_ORDER = uint64max;
@@ -151,10 +152,11 @@ export function parseOrderStatus(chainId, status) {
     order = parseOrder(order)
     filledIn = BigInt(filledIn)
     filledOut = BigInt(filledOut)
-    trancheStatus = trancheStatus.map((obj)=>parseTrancheStatus(obj))
+    const filled = order.amountIsInput ? filledIn : filledOut
+    trancheStatus = trancheStatus.map((obj)=>parseTrancheStatus(obj, order.amountIsInput))
     const result = {
         chainId, order, fillFeeHalfBps, state, startTime, startPrice, ocoGroup,
-        filledIn, filledOut, trancheStatus,
+        filledIn, filledOut, filled, trancheStatus,
     };
     console.log('SwapOrderStatus', result)
     return result
@@ -162,20 +164,23 @@ export function parseOrderStatus(chainId, status) {
 
 function parseFill(obj) {
     let [tx, time, filledIn, filledOut, fee] = obj
+    time = new Date(time * 1000)
     filledIn = BigInt(filledIn)
     filledOut = BigInt(filledOut)
+    const filled = obj.amountIsInput ? filledIn : filledOut
     fee = BigInt(fee)
-    return {tx, time, filledIn, filledOut, fee}
+    return {tx, time, filledIn, filledOut, filled, fee}
 }
 
-function parseTrancheStatus(obj) {
+function parseTrancheStatus(obj, amountIsInput) {
     let [filledIn, filledOut, activationTime, startTime, endTime, rawFills,] = obj
     filledIn = BigInt(filledIn)
     filledOut = BigInt(filledOut)
     const fills = []
     for (const fill of rawFills)
-        fills.push(parseFill(fill))
-    return {filledIn, filledOut, activationTime, startTime, endTime, fills}
+        fills.push(parseFill(fill, amountIsInput))
+    const filled = amountIsInput ? filledIn : filledOut
+    return {filledIn, filledOut, filled, activationTime, startTime, endTime, fills}
 }
 
 export function parseOrder(order) {