Fix re-taken order asks for new buyer invoice

api/logics.py

@@ -306,6 +306,7 @@ class Logics:
                 order.taker = None
                 order.taker_bond = None
                 order.trade_escrow = None
+                order.payout = None
                 cls.publish_order(order)
                 send_message.delay(order.id,'order_published')
                 # Reward maker with part of the taker bond
@@ -661,6 +662,8 @@ class Logics:
             valid = cls.settle_bond(order.taker_bond)
             if valid:
                 order.taker = None
+                order.payout = None
+                order.trade_escrow = None
                 cls.publish_order(order)
                 send_message.delay(order.id,'order_published')
                 # Reward maker with part of the taker bond

frontend/src/components/PaymentText.js

@@ -30,6 +30,7 @@ const someMethods = [
     {name: "DaviPlata",icon:'daviplata'},
     {name: "CoDi",icon:'codi'},
     {name: "TaiwanPay",icon:'taiwanpay'},
+    {name: "MaiCoin",icon:'maicoin'},
     {name: "MercadoPago",icon:'mercadopago'},
     {name: "Monero",icon:'monero'},
     {name: "USDT",icon:'usdt'},

frontend/src/components/TradeBox.js

@@ -384,7 +384,7 @@ class TradeBox extends Component {
             <ListItem>
               <Typography component="body2" variant="body2" align="left">
                 <p>{t("Be patient while robots check the book. This box will ring 🔊 once a robot takes your order, then you will have {{invoice_escrow_duration}} hours to reply. If you do not reply, you risk losing your bond.", {invoice_escrow_duration: pn(this.invoice_escrow_duration)})} </p>
-                <p>{t("If the order expires untaken, your bond will return to you and no action needed.")}</p>
+                <p>{t("If the order expires untaken, your bond will return to you (no action needed).")}</p>
               </Typography>
             </ListItem>
             <Grid item xs={12} align="center">

frontend/src/locales/de.json

@@ -195,6 +195,7 @@
     "You asked for a collaborative cancellation":"You asked for a collaborative cancellation",
     "Invoice expired. You did not confirm publishing the order in time. Make a new order.":"Invoice expired. You did not confirm publishing the order in time. Make a new order.",
     "This order has been cancelled by the maker":"This order has been cancelled by the maker",
+    "Invoice expired. You did not confirm taking the order in time.":"Invoice expired. You did not confirm taking the order in time.",
     "Penalty lifted, good to go!":"Penalty lifted, good to go!",
     "You cannot take an order yet! Wait {{timeMin}}m {{timeSec}}s":"You cannot take an order yet! Wait {{timeMin}}m {{timeSec}}s",
     "Too low":"Too low",

frontend/src/locales/es.json

@@ -195,6 +195,7 @@
     "You asked for a collaborative cancellation":"Solicitaste cancelar colaborativamente",
     "Invoice expired. You did not confirm publishing the order in time. Make a new order.": "Factura caducada: no confirmaste la publicación de la orden a tiempo. Puedes crear una nueva orden.",
     "This order has been cancelled by the maker":"El creador ha cancelado esta orden",
+    "Invoice expired. You did not confirm taking the order in time.":"La factura retenida ha expirado. Al no bloquearla a tiempo, no has confirmado tomar la orden.",
     "Penalty lifted, good to go!":"Sanción revocada, ¡vamos!",
     "You cannot take an order yet! Wait {{timeMin}}m {{timeSec}}s":"¡No puedes tomar una orden aún! Espera {{timeMin}}m {{timeSec}}s",
     "Too low": "Muy poco",
@@ -240,7 +241,7 @@
     "Lock {{amountSats}} Sats as collateral": "Bloquea {{amountSats}} Sats como colateral",
     "Copy to clipboard": "Copiar al portapapeles",
     "This is a hold invoice, it will freeze in your wallet. It will be charged only if you cancel or lose a dispute.": "Esto es una factura retenida, los Sats se bloquean en tu cartera. Solo se cobrará si cancelas o pierdes una disputa.",
-    "This is a hold invoice, it will freeze in your wallet. It will be released to the buyer once you confirm to have received the {{currencyCode}}.": "Esto es una factura retenida, los Sats se bloquean en tu cartera. Será liberada al comprador cuando confirmes que has recibido el {{currencyCode}}.",
+    "This is a hold invoice, it will freeze in your wallet. It will be released to the buyer once you confirm to have received the {{currencyCode}}.": "Esto es una factura retenida, los Sats se bloquean en tu cartera. Será liberada al comprador al confirmar que has recibido {{currencyCode}}.",
     "Your maker bond is locked": "Tu fianza de creador está bloqueada",
     "Your taker bond is locked": "Tu fianza de tomador está bloqueada",
     "Your maker bond was settled": "Tu fianza se ha cobrado",

frontend/src/locales/ru.json

@@ -195,6 +195,7 @@
     "You asked for a collaborative cancellation":"You asked for a collaborative cancellation",
     "Invoice expired. You did not confirm publishing the order in time. Make a new order.":"Invoice expired. You did not confirm publishing the order in time. Make a new order.",
     "This order has been cancelled by the maker":"This order has been cancelled by the maker",
+    "Invoice expired. You did not confirm taking the order in time.":"Invoice expired. You did not confirm taking the order in time.",
     "Penalty lifted, good to go!":"Penalty lifted, good to go!",
     "You cannot take an order yet! Wait {{timeMin}}m {{timeSec}}s":"You cannot take an order yet! Wait {{timeMin}}m {{timeSec}}s",
     "Too low":"Too low",

frontend/src/locales/zh.json

@@ -195,6 +195,7 @@
     "You asked for a collaborative cancellation":"You asked for a collaborative cancellation",
     "Invoice expired. You did not confirm publishing the order in time. Make a new order.":"Invoice expired. You did not confirm publishing the order in time. Make a new order.",
     "This order has been cancelled by the maker":"This order has been cancelled by the maker",
+    "Invoice expired. You did not confirm taking the order in time.":"Invoice expired. You did not confirm taking the order in time.",
     "Penalty lifted, good to go!":"Penalty lifted, good to go!",
     "You cannot take an order yet! Wait {{timeMin}}m {{timeSec}}s":"You cannot take an order yet! Wait {{timeMin}}m {{timeSec}}s",
     "Too low":"Too low",