From 8a34c55fe0fe90a7161e0608c4722da95afd6fad Mon Sep 17 00:00:00 2001
From: tim <tim@dexorder.trade>
Date: Sun, 27 Oct 2024 18:56:36 -0400
Subject: [PATCH] bugfix for order display switching symbols

---
 src/charts/chart.js       |  6 ++++--
 src/components/Status.vue | 22 +++++++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/charts/chart.js b/src/charts/chart.js
index 55d8acd..05266d0 100644
--- a/src/charts/chart.js
+++ b/src/charts/chart.js
@@ -34,10 +34,12 @@ function symbolChanged(symbol) {
 }
 
 
-export async function setSymbol(symbol) {
+export async function setSymbol(symbol, interval=null) {
+    if (interval===null)
+        interval = widget.symbolInterval().interval
     await new Promise(resolve => {
         if (co.selectedSymbol?.ticker !== symbol.ticker)
-            widget.activeChart().setSymbol(symbol.ticker, null, resolve)
+            widget.setSymbol(symbol.ticker, interval, ()=>setTimeout(resolve,0))
         else
             resolve()
     })
diff --git a/src/components/Status.vue b/src/components/Status.vue
index 89a1d8f..ca8b5b1 100644
--- a/src/components/Status.vue
+++ b/src/components/Status.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <v-data-table :headers="datatableHeaders" :items="orders" item-value="id"
-                  :show-select="true" :show-expand="true" v-model="selected">
+                  :show-select="true" :show-expand="true" v-model="selected" select-strategy="single">
       <template v-slot:item.startTime="{ value }">{{ timestampString(value) }}</template>
       <template v-slot:item.input="{ item }">
         <span v-if="item.order.amountIsInput">
@@ -110,7 +110,7 @@
               <span v-if="item.state > OrderState.Signing">
                 <pulse :touch="item.trancheStatus[i].filledIn">
                   <token-amount :chain-id="item.chainId" :addr="item.order.tokenIn"
-                                :amount="item.trancheStatus[i].filledIn" :raw="true"/>
+                                :amount="item.trancheStatus[i].filledIn" :raw="item.order.amountIsInput"/>
                 </pulse>
               </span>
               </suspense>
@@ -127,9 +127,8 @@
               <span v-if="item.state > OrderState.Signing">
                 <pulse :touch="item.trancheStatus[i].filledOut">
                   <token-amount :chain-id="item.chainId" :addr="item.order.tokenOut"
-                                :amount="item.trancheStatus[i].filledOut" :raw="true"/>
+                                :amount="item.trancheStatus[i].filledOut" :raw="!item.order.amountIsInput"/>
                 </pulse>
-                <token-symbol :addr="item.order.tokenOut"/>
               </span>
               </suspense>
               <suspense>
@@ -195,21 +194,30 @@ watch(selected, async ()=>{
       const ticker = tickerForOrder(chainId, status.order)
       const symbol = lookupSymbol(ticker)
       if (co.selectedSymbol.ticker !== ticker) {
-        co.selectedSymbol = symbol
+        // switch symbol
+        deleteOrderShapes()
         await setSymbol(symbol)
+        console.log('change symbol completed')
       }
+      console.log('creating order shape', id)
       orderShapes[id] = new OrderShapes(symbol, status)
     }
   }
+  deleteOrderShapes(selectedIndex)
+})
+
+function deleteOrderShapes(keepSet={}) {
   // now delete old shapes
   const keys = [...Object.keys(orderShapes)]
   for (const id of keys) {
-    if (!(id in selectedIndex)) {
+    if (!(id in keepSet)) {
+      console.log('deleting order shape', id)
       orderShapes[id].delete()
       delete orderShapes[id]
     }
   }
-})
+}
+
 
 const orderShapes = {}