Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-01-18 12:11:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix dispute solve admin actions. Fix i18n var for takerFee.

Browse Source
This commit is contained in:
Reckless_Satoshi 2022-08-18 03:33:55 -07:00
parent 0229f8759e
commit 860b3c136b
No known key found for this signature in database
GPG Key ID: 9C4585B561315571
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/admin.py
View File

@ -127,7 +127,7 @@ class OrderAdmin(AdminChangeLinksMixin, admin.ModelAdmin):
else:
trade_sats = order.trade_escrow.num_satoshis
order.status = Order.Status.TLD
order.status = Order.Status.MLD
order.taker.profile.earned_rewards = own_bond_sats + trade_sats
order.taker.profile.save()
order.save()
@ -149,7 +149,7 @@ class OrderAdmin(AdminChangeLinksMixin, admin.ModelAdmin):
order.taker_bond.sender.profile.save()
order.trade_escrow.sender.profile.earned_rewards += order.trade_escrow.num_satoshis
order.trade_escrow.sender.profile.save()
order.status = Order.Status.TLD
order.status = Order.Status.CCA
order.save()
self.message_user(request,f"Dispute of order {order.id} solved successfully, everything returned as compensations", messages.SUCCESS)

2
frontend/src/components/Dialogs/Info.tsx
View File

@ -131,7 +131,7 @@ const InfoDialog = ({
</AccordionSummary>
<AccordionDetails>
<Typography component="div" variant="body2">
<p>{t("RoboSats total fee for an order is {{tradeFee}}%. This fee is split to be covered by both: the order maker ({{makerFee}}%) and the order taker ({{takerrFee}}%). In case an onchain address is used to received the Sats a variable swap fee applies. Check the exchange details by tapping on the bottom bar icon to see the current swap fee.",{tradeFee:"0.2", makerFee:"0.025", takerFee: "0.175"})} </p>
<p>{t("RoboSats total fee for an order is {{tradeFee}}%. This fee is split to be covered by both: the order maker ({{makerFee}}%) and the order taker ({{takerFee}}%). In case an onchain address is used to received the Sats a variable swap fee applies. Check the exchange details by tapping on the bottom bar icon to see the current swap fee.",{tradeFee:"0.2", makerFee:"0.025", takerFee: "0.175"})} </p>
<p>{t("Be aware your fiat payment provider might charge extra fees. In any case, the buyer bears the costs of sending fiat. That includes banking charges, transfer fees and foreign exchange spreads. The seller must receive exactly the amount stated in the order details.")} </p>
</Typography>
</AccordionDetails>

2
frontend/static/locales/en.json
View File

@ -494,7 +494,7 @@
"All of them as long as they are fast. You can write down your preferred payment method(s). You will have to match with a peer who also accepts that method. The step to exchange fiat has a expiry time of 24 hours before a dispute is automatically open. We highly recommend using instant fiat payment rails.":"All of them as long as they are fast. You can write down your preferred payment method(s). You will have to match with a peer who also accepts that method. The step to exchange fiat has an expiry time of 24 hours before a dispute is automatically open. We highly recommend using instant fiat payment rails.",
"Are there trade limits?":"Are there trade limits?",
"What are the fees?":"What are the fees?",
"RoboSats total fee for an order is {{tradeFee}}%. This fee is split to be covered by both: the order maker ({{makerFee}}%) and the order taker ({{takerrFee}}%). In case an onchain address is used to received the Sats a variable swap fee applies. Check the exchange details by tapping on the bottom bar icon to see the current swap fee":"RoboSats total fee for an order is {{tradeFee}}%. This fee is split to be covered by both: the order maker ({{makerFee}}%) and the order taker ({{takerrFee}}%). In case an onchain address is used to received the Sats a variable swap fee applies. Check the exchange details by tapping on the bottom bar icon to see the current swap fee",
"RoboSats total fee for an order is {{tradeFee}}%. This fee is split to be covered by both: the order maker ({{makerFee}}%) and the order taker ({{takerFee}}%). In case an onchain address is used to received the Sats a variable swap fee applies. Check the exchange details by tapping on the bottom bar icon to see the current swap fee.":"RoboSats total fee for an order is {{tradeFee}}%. This fee is split to be covered by both: the order maker ({{makerFee}}%) and the order taker ({{takerFee}}%). In case an onchain address is used to received the Sats a variable swap fee applies. Check the exchange details by tapping on the bottom bar icon to see the current swap fee.",
"Be aware your fiat payment provider might charge extra fees. In any case, the buyer bears the costs of sending fiat. That includes banking charges, transfer fees and foreign exchange spreads. The seller must receive exactly the amount stated in the order details.":"Be aware your fiat payment provider might charge extra fees. In any case, the buyer bears the costs of sending fiat. That includes banking charges, transfer fees and foreign exchange spreads. The seller must receive exactly the amount stated in the order details.",
"Maximum single trade size is {{maxAmount}} Satoshis to minimize lightning routing failure. There is no limits to the number of trades per day. A robot can only have one order at a time. However, you can use multiple robots simultaneously in different browsers (remember to back up your robot tokens!).":"Maximum single trade size is {{maxAmount}} Satoshis to minimize lightning routing failure. There is no limits to the number of trades per day. A robot can only have one order at a time. However, you can use multiple robots simultaneously in different browsers (remember to back up your robot tokens!).",
"Is RoboSats private?":"Is RoboSats private?",

2
frontend/static/locales/es.json
View File

@ -494,7 +494,7 @@
"What payment methods are accepted?": "¿Qué métodos de pago son aceptados?",
"All of them as long as they are fast. You can write down your preferred payment method(s). You will have to match with a peer who also accepts that method. The step to exchange fiat has a expiry time of 24 hours before a dispute is automatically open. We highly recommend using instant fiat payment rails.": "Todos siempre que sean rápidos. Puedes escribir abajo tu método de pago preferido(s). Tendrás que encontrar un compañero que acepte ese método. El paso para intercambiar el fiat tiene un tiempo de expiración de 24 horas antes de que se abra una disputa automáticamente. Te recomendamos métodos instantáneos de envío de fiat.",
"What are the fees?":"¿Cuales son las comisiones?",
"RoboSats total fee for an order is {{tradeFee}}%. This fee is split to be covered by both: the order maker ({{makerFee}}%) and the order taker ({{takerrFee}}%). In case an onchain address is used to received the Sats a variable swap fee applies. Check the exchange details by tapping on the bottom bar icon to see the current swap fee.":"La comisión total de un intercambio es {{tradeFee}}%. Esta comisión se divide en: creador de la orden ({{makerFee}}%) y tomador de la order ({{takerFee}}%). En caso de que se utilize una dirección onchain para recibir los chats también exise una comisión variable para cubrir el coste del swap (ver las estadisticas del exchange clickando abajo para ver el coste actual del swap).",
"RoboSats total fee for an order is {{tradeFee}}%. This fee is split to be covered by both: the order maker ({{makerFee}}%) and the order taker ({{takerFee}}%). In case an onchain address is used to received the Sats a variable swap fee applies. Check the exchange details by tapping on the bottom bar icon to see the current swap fee.":"La comisión total de un intercambio es {{tradeFee}}%. Esta comisión se divide en: creador de la orden ({{makerFee}}%) y tomador de la order ({{takerFee}}%). En caso de que se utilize una dirección onchain para recibir los chats también exise una comisión variable para cubrir el coste del swap (ver las estadisticas del exchange clickando abajo para ver el coste actual del swap).",
"Be aware your fiat payment provider might charge extra fees. In any case, the buyer bears the costs of sending fiat. That includes banking charges, transfer fees and foreign exchange spreads. The seller must receive exactly the amount stated in the order details.":"Ten en cuenta que tu pasarela de pagos fiat puede cobrarte comisiones extra. En cualquier caso, estos costes siempre son cubiertos por el comprador. Esto incluye, comsiones de transferencia, costes bancarios y horquilla de intercambio de divisas. El vendedor debe recibir la cantidad exacta que se detalla en la orden.",
"Are there trade limits?": "¿Hay límites de intercambios?",
"Maximum single trade size is {{maxAmount}} Satoshis to minimize lightning routing failure. There is no limits to the number of trades per day. A robot can only have one order at a time. However, you can use multiple robots simultaneously in different browsers (remember to back up your robot tokens!).": "Para minimizar fallos en el enrutamiento Lightning, el máximo por intercambio es de {{maxAmount}} Sats. No hay límite de intercambios en el tiempo. Aunque un Robot solo puede intervenir en una orden a la vez, puedes usar varios Robots en diferentes navegadores (¡recuerda guardar los tokens de tus Robots!).",