diff --git a/lnbits/extensions/lnurlp/crud.py b/lnbits/extensions/lnurlp/crud.py index 2eda3322..c7046588 100644 --- a/lnbits/extensions/lnurlp/crud.py +++ b/lnbits/extensions/lnurlp/crud.py @@ -9,11 +9,6 @@ async def create_pay_link(data: CreatePayLinkData, wallet_id: str) -> PayLink: returning = "" if db.type == SQLITE else "RETURNING ID" method = db.execute if db.type == SQLITE else db.fetchone - # database only allows int4 entries for min and max. For fiat currencies, - # we multiply by data.fiat_base_multiplier (usually 100) to save the value in cents. - if data.currency and data.fiat_base_multiplier: - data.min *= data.fiat_base_multiplier - data.max *= data.fiat_base_multiplier result = await (method)( f""" diff --git a/lnbits/extensions/lnurlp/views_api.py b/lnbits/extensions/lnurlp/views_api.py index 52d729a9..6123043c 100644 --- a/lnbits/extensions/lnurlp/views_api.py +++ b/lnbits/extensions/lnurlp/views_api.py @@ -89,6 +89,12 @@ async def api_link_create_or_update( detail="Must use full satoshis.", status_code=HTTPStatus.BAD_REQUEST ) + # database only allows int4 entries for min and max. For fiat currencies, + # we multiply by data.fiat_base_multiplier (usually 100) to save the value in cents. + if data.currency and data.fiat_base_multiplier: + data.min *= data.fiat_base_multiplier + data.max *= data.fiat_base_multiplier + if "success_url" in data and data.success_url[:8] != "https://": raise HTTPException( detail="Success URL must be secure https://...", diff --git a/lnbits/templates/base.html b/lnbits/templates/base.html index 758a746f..bf29bce6 100644 --- a/lnbits/templates/base.html +++ b/lnbits/templates/base.html @@ -38,7 +38,8 @@ Logo {%else%} {% if SITE_TITLE != 'LNbits' %} {{ SITE_TITLE }} {% else %} - LNbits {% endif %} {%endif%} {% endblock %} + LNbits {% endif %} {%endif%} {% + endblock %} {% block beta %} diff --git a/lnbits/templates/public.html b/lnbits/templates/public.html index a0dcbda8..8e953ed1 100644 --- a/lnbits/templates/public.html +++ b/lnbits/templates/public.html @@ -8,6 +8,7 @@ {% if USE_CUSTOM_LOGO %} Logo {%else%} {% if SITE_TITLE != 'LNbits' %} {{ SITE_TITLE }} {% else %} - LNbits {% endif %} {% endif %} + LNbits + {% endif %} {% endif %} {% endblock %} diff --git a/requirements.txt b/requirements.txt index b84e4ab6..4062bc25 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,7 +24,7 @@ lnurl==0.3.6 markupsafe==2.0.1 marshmallow==3.13.0 outcome==1.1.0 -psycopg2-binary==2.9.1 +psycopg2==2.9.3 pycryptodomex==3.14.1 pydantic==1.8.2 pypng==0.0.21