RoboSats
diff --git a/‎api/admin.py
+6 b/‎api/admin.py
+6
diff --git a/‎api/lightning/cln.py
+4-4 b/‎api/lightning/cln.py
+4-4
diff --git a/‎api/lightning/lnd.py
+4-3 b/‎api/lightning/lnd.py
+4-3
@@ -11,6 +11,7 @@
 from api.logics import Logics
 from api.models import Currency, LNPayment, MarketTick, OnchainPayment, Order, Robot
 from api.utils import objects_to_hyperlinks
+from api.tasks import send_notification
 
 admin.site.unregister(Group)
 admin.site.unregister(User)
@@ -163,6 +164,9 @@ def cancel_public_order(self, request, queryset):
                         f"Order {order.id} successfully closed",
                         messages.SUCCESS,
                     )
+                    send_notification.delay(
+                        order_id=order.id, message="coordinator_cancelled"
+                    )
                 else:
                     self.message_user(
                         request,
@@ -206,6 +210,7 @@ def maker_wins(self, request, queryset):
                     f"Dispute of order {order.id} solved successfully on favor of the maker",
                     messages.SUCCESS,
                 )
+                send_notification.delay(order_id=order.id, message="dispute_closed")
 
             else:
                 self.message_user(
@@ -244,6 +249,7 @@ def taker_wins(self, request, queryset):
                     f"Dispute of order {order.id} solved successfully on favor of the taker",
                     messages.SUCCESS,
                 )
+                send_notification.delay(order_id=order.id, message="dispute_closed")
 
             else:
                 self.message_user(
 
@@ -617,10 +617,10 @@ def handle_response():
                         ]
                     )
 
+                    order.update_status(Order.Status.FAI)
                     order.expires_at = timezone.now() + timedelta(
                         seconds=order.t_to_expire(Order.Status.FAI)
                     )
-                    order.update_status(Order.Status.FAI)
                     order.save(update_fields=["expires_at"])
 
                     print(
@@ -646,10 +646,10 @@ def handle_response():
                     )
                     lnpayment.preimage = response.payment_preimage.hex()
                     lnpayment.save(update_fields=["status", "fee", "preimage"])
+                    order.update_status(Order.Status.SUC)
                     order.expires_at = timezone.now() + timedelta(
                         seconds=order.t_to_expire(Order.Status.SUC)
                     )
-                    order.update_status(Order.Status.SUC)
                     order.save(update_fields=["expires_at"])
 
                     order.log(
@@ -697,10 +697,10 @@ def handle_response():
                             ]
                         )
 
+                        order.update_status(Order.Status.FAI)
                         order.expires_at = timezone.now() + timedelta(
                             seconds=order.t_to_expire(Order.Status.FAI)
                         )
-                        order.update_status(Order.Status.FAI)
                         order.save(update_fields=["expires_at"])
 
                         print(
@@ -737,10 +737,10 @@ def handle_response():
                                     "in_flight",
                                 ]
                             )
+                            order.update_status(Order.Status.FAI)
                             order.expires_at = timezone.now() + timedelta(
                                 seconds=order.t_to_expire(Order.Status.FAI)
                             )
-                            order.update_status(Order.Status.FAI)
                             order.save(update_fields=["expires_at"])
 
                             order.log(
 
@@ -594,10 +594,11 @@ def handle_response(response, was_in_transit=False):
                     ]
                 )
 
+                order.update_status(Order.Status.FAI)
+
                 order.expires_at = timezone.now() + timedelta(
                     seconds=order.t_to_expire(Order.Status.FAI)
                 )
-                order.update_status(Order.Status.FAI)
                 order.save(update_fields=["expires_at"])
 
                 str_failure_reason = cls.payment_failure_context[
@@ -624,10 +625,10 @@ def handle_response(response, was_in_transit=False):
                 lnpayment.preimage = response.payment_preimage
                 lnpayment.save(update_fields=["status", "fee", "preimage"])
 
+                order.update_status(Order.Status.SUC)
                 order.expires_at = timezone.now() + timedelta(
                     seconds=order.t_to_expire(Order.Status.SUC)
                 )
-                order.update_status(Order.Status.SUC)
                 order.save(update_fields=["expires_at"])
 
                 order.log(
@@ -670,10 +671,10 @@ def handle_response(response, was_in_transit=False):
                             update_fields=["status", "last_routing_time", "in_flight"]
                         )
 
+                        order.update_status(Order.Status.FAI)
                         order.expires_at = timezone.now() + timedelta(
                             seconds=order.t_to_expire(Order.Status.FAI)
                         )
-                        order.update_status(Order.Status.FAI)
                         order.save(update_fields=["expires_at"])
 
                         order.log(
Original file line number	Diff line number	Diff line change
`@@ -617,10 +617,10 @@ def handle_response():`
`617`	`617`	`]`
`618`	`618`	`)`
`619`	`619`
	`620`	`+ order.update_status(Order.Status.FAI)`
`620`	`621`	`order.expires_at = timezone.now() + timedelta(`
`621`	`622`	`seconds=order.t_to_expire(Order.Status.FAI)`
`622`	`623`	`)`
`623`		`- order.update_status(Order.Status.FAI)`
`624`	`624`	`order.save(update_fields=["expires_at"])`
`625`	`625`
`626`	`626`	`print(`
`@@ -646,10 +646,10 @@ def handle_response():`
`646`	`646`	`)`
`647`	`647`	`lnpayment.preimage = response.payment_preimage.hex()`
`648`	`648`	`lnpayment.save(update_fields=["status", "fee", "preimage"])`
	`649`	`+ order.update_status(Order.Status.SUC)`
`649`	`650`	`order.expires_at = timezone.now() + timedelta(`
`650`	`651`	`seconds=order.t_to_expire(Order.Status.SUC)`
`651`	`652`	`)`
`652`		`- order.update_status(Order.Status.SUC)`
`653`	`653`	`order.save(update_fields=["expires_at"])`
`654`	`654`
`655`	`655`	`order.log(`
`@@ -697,10 +697,10 @@ def handle_response():`
`697`	`697`	`]`
`698`	`698`	`)`
`699`	`699`
	`700`	`+ order.update_status(Order.Status.FAI)`
`700`	`701`	`order.expires_at = timezone.now() + timedelta(`
`701`	`702`	`seconds=order.t_to_expire(Order.Status.FAI)`
`702`	`703`	`)`
`703`		`- order.update_status(Order.Status.FAI)`
`704`	`704`	`order.save(update_fields=["expires_at"])`
`705`	`705`
`706`	`706`	`print(`
`@@ -737,10 +737,10 @@ def handle_response():`
`737`	`737`	`"in_flight",`
`738`	`738`	`]`
`739`	`739`	`)`
	`740`	`+ order.update_status(Order.Status.FAI)`
`740`	`741`	`order.expires_at = timezone.now() + timedelta(`
`741`	`742`	`seconds=order.t_to_expire(Order.Status.FAI)`
`742`	`743`	`)`
`743`		`- order.update_status(Order.Status.FAI)`
`744`	`744`	`order.save(update_fields=["expires_at"])`
`745`	`745`
`746`	`746`	`order.log(`
Original file line number	Diff line number	Diff line change
`@@ -594,10 +594,11 @@ def handle_response(response, was_in_transit=False):`
`594`	`594`	`]`
`595`	`595`	`)`
`596`	`596`
	`597`	`+ order.update_status(Order.Status.FAI)`
	`598`	`+`
`597`	`599`	`order.expires_at = timezone.now() + timedelta(`
`598`	`600`	`seconds=order.t_to_expire(Order.Status.FAI)`
`599`	`601`	`)`
`600`		`- order.update_status(Order.Status.FAI)`
`601`	`602`	`order.save(update_fields=["expires_at"])`
`602`	`603`
`603`	`604`	`str_failure_reason = cls.payment_failure_context[`
`@@ -624,10 +625,10 @@ def handle_response(response, was_in_transit=False):`
`624`	`625`	`lnpayment.preimage = response.payment_preimage`
`625`	`626`	`lnpayment.save(update_fields=["status", "fee", "preimage"])`
`626`	`627`
	`628`	`+ order.update_status(Order.Status.SUC)`
`627`	`629`	`order.expires_at = timezone.now() + timedelta(`
`628`	`630`	`seconds=order.t_to_expire(Order.Status.SUC)`
`629`	`631`	`)`
`630`		`- order.update_status(Order.Status.SUC)`
`631`	`632`	`order.save(update_fields=["expires_at"])`
`632`	`633`
`633`	`634`	`order.log(`
`@@ -670,10 +671,10 @@ def handle_response(response, was_in_transit=False):`
`670`	`671`	`update_fields=["status", "last_routing_time", "in_flight"]`
`671`	`672`	`)`
`672`	`673`
	`674`	`+ order.update_status(Order.Status.FAI)`
`673`	`675`	`order.expires_at = timezone.now() + timedelta(`
`674`	`676`	`seconds=order.t_to_expire(Order.Status.FAI)`
`675`	`677`	`)`
`676`		`- order.update_status(Order.Status.FAI)`
`677`	`678`	`order.save(update_fields=["expires_at"])`
`678`	`679`
`679`	`680`	`order.log(`