From f5fe0a45b7e38c9e460f7a1ad407e92b18f2f33a Mon Sep 17 00:00:00 2001
From: Tim Olson <>
Date: Sat, 9 Dec 2023 00:59:49 -0400
Subject: [PATCH] tranche tweaks

---
 src/components/Orders.vue | 22 +++++++++++-----------
 src/orderbuild.js         |  2 ++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/components/Orders.vue b/src/components/Orders.vue
index 55cb72f..25f9d87 100644
--- a/src/components/Orders.vue
+++ b/src/components/Orders.vue
@@ -37,6 +37,7 @@
     </template>
     <template v-slot:expanded-row="{item}">
       <tr>
+        <td>&nbsp;</td>
         <td colspan="100">
           <v-table>
 <!--
@@ -50,8 +51,8 @@
 -->
             <tbody>
             <tr v-for="(t, i) in item.order.tranches">
-              <td>Tranche {{ i + 1 }}</td>
-              <td>
+              <td class="text-right">Tranche {{ i + 1 }}</td>
+              <td class="text-center w-33">
                 <suspense>
                 <span>
                   <token-amount :addr="item.amountToken" :amount="item.trancheFilled[i]" :raw="true"/>
@@ -60,10 +61,11 @@
                 </span>
                 </suspense>
               </td>
-              <td>
-                {{describeTrancheTime(item,t)}}
-                {{describeTrancheLine(item,true,t.minIntercept,t.minSlope)}}
-                {{describeTrancheLine(item,false,t.maxIntercept,t.maxSlope)}}
+              <td class="text-left">
+                <span class="mx-3">{{ describeTrancheTime(item, true, t) }}</span>
+                <span class="mx-3">{{ describeTrancheTime(item, false, t) }}</span>
+                <span class="mx-3">{{ describeTrancheLine(item, true, t.minIntercept, t.minSlope) }}</span>
+                <span class="mx-3">{{ describeTrancheLine(item, false, t.maxIntercept, t.maxSlope) }}</span>
               </td>
             </tr>
             </tbody>
@@ -225,22 +227,20 @@ const orders = computed(()=>{
   return result
 })
 
-function describeTrancheTime(st, t) {
+function describeTrancheTime(st, isStart, t) {
   let result = ''
   if( t.minIsBarrier || t.maxIsBarrier )
     return 'barrier'
-  if( t.startTime > 0 ) {
+  if( isStart && t.startTime > 0 ) {
     const started = t.startTimeIsRelative ? st.start + t.startTime : t.startTime
-    console.log('started', started, st.start, t.startTime)
     result += started*1000 < Date.now() ? 'Activated ' : 'Activates '
     result += dateString(started) + ' '
   }
-  if( t.endTime < 4294967295 ) {
+  if( !isStart && t.endTime < 4294967295 ) {
     const ended = t.endTimeIsRelative ? st.start + t.endTime : t.endTime
     result += ended*1000 < Date.now() ? 'Expired ' : 'Expires '
     result += dateString(ended)
   }
-  console.log('tt', st, t)
   return result
 }
 
diff --git a/src/orderbuild.js b/src/orderbuild.js
index 19975f1..8a66fc7 100644
--- a/src/orderbuild.js
+++ b/src/orderbuild.js
@@ -45,6 +45,8 @@ export function timesliceTranches() {
     } else {
         window = Math.round(duration / n)
     }
+    if( window < 60 )
+        window = 60
     const amtPerTranche = Math.ceil(MAX_FRACTION / n)
     duration -= 15  // subtract 15 seconds so the last tranche completes before the deadline
     for (let i = 0; i < n; i++) {