diff --git a/api/tasks.py b/api/tasks.py index 71de616c..b1975b17 100644 --- a/api/tasks.py +++ b/api/tasks.py @@ -40,7 +40,7 @@ def users_cleansing(): return results @shared_task(name="give_rewards") -def users_cleansing(): +def give_rewards(): """ Referral rewards go from pending to earned. Happens asynchronously so the referral program cannot be easily used to spy. @@ -174,8 +174,7 @@ def cache_market(): exchange_rates = get_exchange_rates(currency_codes) results = {} - for i in range(len(Currency.currency_dict.values()) - ): # currecies are indexed starting at 1 (USD) + for i in range(len(Currency.currency_dict.values())): # currencies are indexed starting at 1 (USD) rate = exchange_rates[i] results[i] = {currency_codes[i], rate} @@ -238,5 +237,5 @@ def send_message(order_id, message): elif message == 'fiat_exchange_starts': telegram.fiat_exchange_starts(order) - + return \ No newline at end of file diff --git a/docs/how-to-use.md b/docs/how-to-use.md index 7db19800..1c360d5b 100644 --- a/docs/how-to-use.md +++ b/docs/how-to-use.md @@ -143,7 +143,7 @@ We can create the order exactly has we want it. But mind that you need to publis In the maker page you are only required to enter the currency, order type (buy/sell) and amount. However, it is best practice to specify the payment methods you allow. It might be also helpful to set a premium/discount for your order to be taken faster. Remember that as a seller you can incentivze buyers to take your order by lowering the premium. If there are too many buyers, however, you can increase the premium to have a trading profit. Alternatively, you can set a fixed amount of Satoshis. -*Limits: in Robosats v0.1.0 an order cannot be smaller than 20.000 Satoshis. It cannot be larger than 800.000 Satoshis in order to avoid lightning routing failures. This limit will be increased in the future.* +*Limits: in Robosats v0.1.0 an order cannot be smaller than 20.000 Satoshis. It cannot be larger than 1,200,000 Satoshis in order to avoid lightning routing failures. This limit will be increased in the future.*
diff --git a/docs/how-to-use_de.md b/docs/how-to-use_de.md index 3384f812..3da06c2e 100644 --- a/docs/how-to-use_de.md +++ b/docs/how-to-use_de.md @@ -146,7 +146,7 @@ Wir können das Angebot genau so erstellen, wie wir es haben wollen. Aber denke Auf der Maker Seite musst du nur die Währung, die Angebotsart (Kauf/Verkauf) und den Betrag eingeben. Es empfiehlt sich jedoch, die zulässigen Zahlungsarten anzugeben. Es könnte auch hilfreich sein, einen Aufschlag/Rabatt festzulegen, damit dein Angebot schneller angenommen wird. Denke daran, dass du als Verkäufer einen Anreiz für Käufer schaffen kannst, dein Angebot anzunehmen, indem du die Prämie senkst. Wenn es jedoch zu viele Käufer gibt, kannst du die Prämie erhöhen, um einen Handelsgewinn zu erzielen. Alternativ kannst du auch einen festen Betrag an Satoshis festlegen. -*Limits: in Robosats v0.1.0 kann ein Angebot nicht kleiner als 20.000 Satoshis sein ubd es kann nicht größer als 800.000 Satoshis sein, um Fehler beim weiterleiten der Lightning-Zahlung zu vermeiden. Dieses Limit wird in Zukunft erhöht werden. +*Limits: in Robosats v0.1.0 kann ein Angebot nicht kleiner als 20.000 Satoshis sein ubd es kann nicht größer als 1.200.000 Satoshis sein, um Fehler beim weiterleiten der Lightning-Zahlung zu vermeiden. Dieses Limit wird in Zukunft erhöht werden.
diff --git a/docs/how-to-use_es.md b/docs/how-to-use_es.md index 6da01edd..75c6c9a4 100644 --- a/docs/how-to-use_es.md +++ b/docs/how-to-use_es.md @@ -145,7 +145,7 @@ Puedes crear una orden que se adapte a tus condiciones. Pero ten en cuenta que e Al crear una orden, solo es requerido especificar la moneda, el tipo de orden (compra/venta) y el monto. Sin embargo, es una buena práctica especificar los métodos de pago que permites. También puede ser útil establecer una prima/descuento para que tu orden sea más interesante para los tomadores. Recuerda que, como vendedor, puedes incentivar a los compradores a tomar tu orden al reducir la prima. Sin embargo, si hay demasiados compradores, puedes aumentar la prima para obtener un mayor margen de beneficio. Como alternativa, puedes establecer una cantidad fija de Satoshis. -*Límites: en la versión 0.1.0 de Robosats una orden no puede ser inferior a 10.000 Satoshis. Para evitar fallos de enrutamiento no puede ser mayor a 500.000 Satoshis. Este límite se incrementará en el futuro.* +*Límites: en la versión 0.1.0 de Robosats una orden no puede ser inferior a 10.000 Satoshis. Para evitar fallos de enrutamiento no puede ser mayor a 1.200.000 Satoshis. Este límite se incrementará en el futuro.*
diff --git a/frontend/src/components/BookPage.js b/frontend/src/components/BookPage.js index 24d7b84f..9ea9d3dc 100644 --- a/frontend/src/components/BookPage.js +++ b/frontend/src/components/BookPage.js @@ -13,9 +13,11 @@ import PaymentText from './PaymentText' // Icons import RefreshIcon from '@mui/icons-material/Refresh'; -import DoubleArrowIcon from '@mui/icons-material/DoubleArrow'; -import MoveToInboxIcon from '@mui/icons-material/MoveToInbox'; -import OutboxIcon from '@mui/icons-material/Outbox'; +import SendReceiveIcon from "./icons/SendReceiveIcon"; +import BuySatsIcon from "./icons/BuySatsIcon"; +import BuySatsCheckedIcon from "./icons/BuySatsCheckedIcon"; +import SellSatsIcon from "./icons/SellSatsIcon"; +import SellSatsCheckedIcon from "./icons/SellSatsCheckedIcon"; class BookPage extends Component { constructor(props) { @@ -108,7 +110,7 @@ class BookPage extends Component { - {params.row.type == t("Buyer") ? : }
}> + {params.row.type == t("Buyer") ? : }
}>
- {params.row.type == t("Buyer") ? : }
}> + {params.row.type == t("Buyer") ? : }
}>
} checkedIcon={}/>} + control={} checkedIcon={}/>} label={
{this.props.buyChecked ? @@ -356,7 +358,7 @@ class BookPage extends Component { />
} checkedIcon={}/>} + control={} checkedIcon={}/>} label={
{this.props.sellChecked ? diff --git a/frontend/src/components/InfoDialog.js b/frontend/src/components/InfoDialog.js index 4b86f288..39819a04 100644 --- a/frontend/src/components/InfoDialog.js +++ b/frontend/src/components/InfoDialog.js @@ -67,7 +67,7 @@ class InfoDialog extends Component { {t("Are there trade limits?")} -

{t("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!).", {maxAmount: '800,000'})}

+

{t("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!).", {maxAmount: '1,200,000'})}

{t("Is RoboSats private?")} diff --git a/frontend/src/components/MakerPage.js b/frontend/src/components/MakerPage.js index b83239e1..d857038b 100644 --- a/frontend/src/components/MakerPage.js +++ b/frontend/src/components/MakerPage.js @@ -11,11 +11,13 @@ import AutocompletePayments from './AutocompletePayments'; import currencyDict from '../../static/assets/currencies.json'; //icons -import MoveToInboxIcon from '@mui/icons-material/MoveToInbox'; -import OutboxIcon from '@mui/icons-material/Outbox'; import LockIcon from '@mui/icons-material/Lock'; import HourglassTopIcon from '@mui/icons-material/HourglassTop'; import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; +import BuySatsIcon from "./icons/BuySatsIcon"; +import BuySatsCheckedIcon from "./icons/BuySatsCheckedIcon"; +import SellSatsIcon from "./icons/SellSatsIcon"; +import SellSatsCheckedIcon from "./icons/SellSatsCheckedIcon"; import { getCookie } from "../utils/cookies"; import { pn } from "../utils/prettyNumbers"; @@ -27,7 +29,7 @@ class MakerPage extends Component { defaultPaymentMethod = "not specified"; defaultPremium = 0; minTradeSats = 20000; - maxTradeSats = 800000; + maxTradeSats = 1200000; maxBondlessSats = 50000; maxRangeAmountMultiple = 4.8; minRangeAmountMultiple = 1.6; @@ -268,13 +270,13 @@ class MakerPage extends Component { } checkedIcon={}/>} + control={} checkedIcon={}/>} label={this.state.type == 0 ? {t("Buy")}: {t("Buy")}} labelPlacement="end" /> } checkedIcon={}/>} + control={} checkedIcon={}/>} label={this.state.type == 1 ? {t("Sell")}: {t("Sell")}} labelPlacement="end" /> diff --git a/frontend/src/components/OrderPage.js b/frontend/src/components/OrderPage.js index b9bb829a..63991257 100644 --- a/frontend/src/components/OrderPage.js +++ b/frontend/src/components/OrderPage.js @@ -16,7 +16,7 @@ import NumbersIcon from '@mui/icons-material/Numbers'; import PriceChangeIcon from '@mui/icons-material/PriceChange'; import PaymentsIcon from '@mui/icons-material/Payments'; import ArticleIcon from '@mui/icons-material/Article'; -import DoubleArrowIcon from '@mui/icons-material/DoubleArrow'; +import SendReceiveIcon from "./icons/SendReceiveIcon"; import HourglassTopIcon from '@mui/icons-material/HourglassTop'; import { getCookie } from "../utils/cookies"; @@ -488,7 +488,7 @@ class OrderPage extends Component { - {!this.state.type ? : }
}> + {!this.state.type ? : }
}> - {this.state.type ? : }
}> + {this.state.type ? : }}> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); + } \ No newline at end of file diff --git a/frontend/src/components/icons/BuySatsIcon.js b/frontend/src/components/icons/BuySatsIcon.js new file mode 100644 index 00000000..84e00818 --- /dev/null +++ b/frontend/src/components/icons/BuySatsIcon.js @@ -0,0 +1,117 @@ +import React, { Component } from "react"; +import { SvgIcon } from "@mui/material" + +export default function BuySatsIcon(props) { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); + } \ No newline at end of file diff --git a/frontend/src/components/icons/SellSatsCheckedIcon.js b/frontend/src/components/icons/SellSatsCheckedIcon.js new file mode 100644 index 00000000..7d8710d3 --- /dev/null +++ b/frontend/src/components/icons/SellSatsCheckedIcon.js @@ -0,0 +1,118 @@ +import React, { Component } from "react"; +import { SvgIcon } from "@mui/material" + +export default function SellSatsCheckedIcon(props) { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +} \ No newline at end of file diff --git a/frontend/src/components/icons/SellSatsIcon.js b/frontend/src/components/icons/SellSatsIcon.js new file mode 100644 index 00000000..964ed938 --- /dev/null +++ b/frontend/src/components/icons/SellSatsIcon.js @@ -0,0 +1,118 @@ +import React, { Component } from "react"; +import { SvgIcon } from "@mui/material" + +export default function SellSatsIcon(props) { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); + } \ No newline at end of file diff --git a/frontend/src/components/icons/SendReceiveIcon.js b/frontend/src/components/icons/SendReceiveIcon.js new file mode 100644 index 00000000..bab11e03 --- /dev/null +++ b/frontend/src/components/icons/SendReceiveIcon.js @@ -0,0 +1,23 @@ +import React, { Component } from "react"; +import { SvgIcon } from "@mui/material" + +export default function SendReceiveIcon(props) { + return ( + + + + + + ); + } \ No newline at end of file