Reduced binance api querying on cancel orders.

Fixed "Edit" button doesn't close the diaglog

Author: iilunin

Bot/FXConnector.py

@@ -84,14 +84,35 @@ def stop_listening(self):
 
     @retry(**DEFAULT_RETRY_SETTINGS)
     def cancel_order(self, sym, id):
+        '''
+        :param sym:
+        :param id:
+        :return:
+        {
+            'symbol': 'ETCUSDT',
+            'origClientOrderId': 'asd',
+            'orderId': 1211742179,
+            'orderListId': -1,
+            'clientOrderId': 'xyz',
+            'price': '100.00000000',
+            'origQty': '5.00000000',
+            'executedQty': '0.00000000',
+            'cummulativeQuoteQty': '0.00000000',
+            'status': 'CANCELED',
+            'timeInForce': 'GTC',
+            'type': 'LIMIT',
+            'side': 'SELL'}
+        '''
         return self.client.cancel_order(symbol=sym, orderId=id)
 
     @retry(**DEFAULT_RETRY_SETTINGS)
     def cancel_open_orders(self, sym):
-        orders = self.get_open_orders(sym)
-        if orders:
-            for order_id in orders:
-                self.client.cancel_order(symbol=sym, orderId=order_id)
+        return self.client._delete('openOrders',True, data={'symbol': sym})
+        # self.client.cancel_open
+        # orders = self.get_open_orders(sym)
+        # if orders:
+        #     for order_id in orders:
+        #         self.client.cancel_order(symbol=sym, orderId=order_id)
 
     def get_server_time(self):
         return self.client.get_server_time()

Bot/Strategy/EntryStrategy.py

@@ -213,9 +213,10 @@ def handle_stoploss_order(self, trigger_order_price, current_price):
     def cancel_current_limit_order(self):
         if self.current_target.is_active():
             try:
-                status = self.fx.get_order_status(self.symbol(), self.current_target.id)
+                # status = self.fx.get_order_status(self.symbol(), self.current_target.id)
+                status = self.fx.cancel_order(self.symbol(), self.current_target.id)
 
-                if self.fx.cancel_order(self.symbol(), self.current_target.id):
+                if status['status'] == 'CANCELED':
                     canceled_time = datetime.now()
                     self.current_target.set_canceled()
                     self.trigger_target_updated()

admin/src/app/asset-table/asset-table.component.ts

@@ -63,13 +63,10 @@ export class AssetTableComponent implements OnInit, OnDestroy {
     }
 
     this.tradeNotificationSubscription = this.tradeService.eventAnounces$.subscribe(res => {
-      if (res.type === 'created') {
+      if (res.type === 'created' || res.type === 'updated') {
         this.refreshTrades();
-        // setTimeout(this.refreshTrades.bind(this), 0);
       }
     });
-
-    // this.onTradeInfo(null, TradeDetailMode.Create);
   }
 
   ngOnDestroy() {

admin/src/app/trade-details/trade-details.component.html

@@ -74,7 +74,7 @@ <h1 mat-dialog-title>
   </mat-accordion>
   </div>
   <div mat-dialog-actions align="end">
-    <button mat-button type="submit" color="primary" (click)="confirm()" *ngIf="!mode.isView()" [disabled]="myControl.errors && mode.isCreate()" >{{ mode.str() }}</button>
+    <button mat-button type="submit" color="primary" (click)="confirm()" *ngIf="!mode.isView()" [disabled]="myControl.errors && mode.isCreate()" >{{ mode.isCreate()? "Create":"Save" }}</button>
     <button mat-button mat-dialog-close="cancel" color="primary">Cancel</button>
   </div>
 </form>

admin/src/app/trade-details/trade-details.component.ts

@@ -104,13 +104,12 @@ export class TradeDetailsComponent implements OnInit {
   confirm() {    
     this.api.addTrade(this.trade).subscribe(
       res => {
-        if (this.mode.isCreate()) {
-          
-          this.tradeService.anounce(new TradeEvent('TradeDeatails', 'created'));
-          
-          if(!this.myControl.errors && this.dialogRef)
-            this.dialogRef.close()
+        if (this.mode.isCreate() || this.mode.isEdit()) {
+          this.tradeService.anounce(new TradeEvent('TradeDeatails', this.mode.isCreate() ? 'created': 'updated'));
         }
+
+        if(!this.myControl.errors && this.dialogRef)
+            this.dialogRef.close()
       },
       err => {
         this.notificationService.NotifyAlert('Trade creation error');