core/lib/schemas/oanda_s.py

@@ -602,20 +602,6 @@ class TradeDetails(BaseModel):
 
 
 TradeDetailsSchema = {
-    "id": "trade.id",
+    "trade": "trade",
-    "symbol": "trade.instrument",
-    "price": "trade.price",
-    "openTime": "trade.openTime",
-    "initialUnits": "trade.initialUnits",
-    "initialMarginRequired": "trade.initialMarginRequired",
-    "state": "trade.state",
-    "currentUnits": "trade.currentUnits",
-    "realizedPL": "trade.realizedPL",
-    "closingTransactionIDs": "trade.closingTransactionIDs",
-    "financing": "trade.financing",
-    "dividendAdjustment": "trade.dividendAdjustment",
-    "closeTime": "trade.closeTime",
-    "averageClosePrice": "trade.averageClosePrice",
-    "clientExtensions": "trade.clientExtensions",
     "lastTransactionID": "lastTransactionID",
 }

core/templates/window-content/trade.html

@@ -29,7 +29,7 @@
   </thead>
   <tbody>
     {% for key, item in db_info.items %}
-      {% if key == 'response' %}
+      {% if key == 'instruments' %}
         <tr>
           <th>{{ key }}</th>
           <td>

core/views/trades.py

@@ -50,15 +50,12 @@ class TradeAction(LoginRequiredMixin, OTPRequiredMixin, View):
 
         if type == "page":
             type = "modal"
-        db_info = db_info.__dict__
-        del db_info["_state"]
-        del db_info["_original"]
         context = {
             "title": f"Trade info ({type})",
             "unique": unique,
             "window_content": self.window_content,
             "type": type,
-            "db_info": db_info,
+            "db_info": db_info.__dict__,
             "live_info": live_info,
         }