diff --git a/lnbits/app.py b/lnbits/app.py index 2cca3cc8..a27b4913 100644 --- a/lnbits/app.py +++ b/lnbits/app.py @@ -69,7 +69,6 @@ from .tasks import ( async def startup(app: FastAPI): - # wait till migration is done await migrate_databases() @@ -177,7 +176,6 @@ def create_app() -> FastAPI: async def check_funding_source() -> None: - funding_source = get_funding_source() max_retries = settings.funding_source_max_retries diff --git a/lnbits/core/services.py b/lnbits/core/services.py index 4d2ccf1f..9154fdec 100644 --- a/lnbits/core/services.py +++ b/lnbits/core/services.py @@ -146,14 +146,17 @@ async def create_invoice( f"{settings.lnbits_wallet_limit_max_balance} sats." ) - ok, checking_id, payment_request, error_message = ( - await funding_source.create_invoice( - amount=amount_sat, - memo=invoice_memo, - description_hash=description_hash, - unhashed_description=unhashed_description, - expiry=expiry or settings.lightning_invoice_expiry, - ) + ( + ok, + checking_id, + payment_request, + error_message, + ) = await funding_source.create_invoice( + amount=amount_sat, + memo=invoice_memo, + description_hash=description_hash, + unhashed_description=unhashed_description, + expiry=expiry or settings.lightning_invoice_expiry, ) if not ok or not payment_request or not checking_id: raise InvoiceError(error_message or "unexpected backend error.") diff --git a/lnbits/core/templates/core/index.html b/lnbits/core/templates/core/index.html index 1a6a3b44..c3fdac85 100644 --- a/lnbits/core/templates/core/index.html +++ b/lnbits/core/templates/core/index.html @@ -502,18 +502,28 @@ - {% if AD_SPACE %} {% for ADS in AD_SPACE %} {% set AD = ADS.split(';') %} -
+ {% if AD_SPACE %} +
{{ AD_SPACE_TITLE }} +
+ {% for ADS in AD_SPACE %} {% set AD = ADS.split(';') %} + - - - - + {% endfor %} +
- {% endfor %} {% endif %} + {% endif %}
diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html index 1785f510..4e260dc7 100644 --- a/lnbits/core/templates/core/wallet.html +++ b/lnbits/core/templates/core/wallet.html @@ -459,19 +459,21 @@ - {% endif %} {% if AD_SPACE %} {% for ADS in AD_SPACE %} {% set AD = - ADS.split(";") %} + {% endif %} {% if AD_SPACE %}
{{ AD_SPACE_TITLE }}
+ {% for ADS in AD_SPACE %} {% set AD = ADS.split(";") %} + -
{% endfor %} {% endif %} + {% endfor %} + + {% endif %}
diff --git a/lnbits/settings.py b/lnbits/settings.py index 3b28b168..0bfa2724 100644 --- a/lnbits/settings.py +++ b/lnbits/settings.py @@ -99,7 +99,7 @@ class ThemesSettings(LNbitsSettings): lnbits_custom_logo: str = Field(default=None) lnbits_ad_space_title: str = Field(default="Supported by") lnbits_ad_space: str = Field( - default="https://shop.lnbits.com/;/static/images/lnbits-shop-light.png;/static/images/lnbits-shop-dark.png" + default="https://shop.lnbits.com/;/static/images/bitcoin-shop-banner.png;/static/images/bitcoin-shop-banner.png,https://affil.trezor.io/aff_c?offer_id=169&aff_id=33845;/static/images/bitcoin-hardware-wallet.png;/static/images/bitcoin-hardware-wallet.png,https://opensats.org/;/static/images/open-sats.png;/static/images/open-sats.png" ) # sneaky sneaky lnbits_ad_space_enabled: bool = Field(default=False) lnbits_allowed_currencies: list[str] = Field(default=[]) diff --git a/lnbits/static/images/bitcoin-hardware-wallet.png b/lnbits/static/images/bitcoin-hardware-wallet.png new file mode 100644 index 00000000..897684fc Binary files /dev/null and b/lnbits/static/images/bitcoin-hardware-wallet.png differ diff --git a/lnbits/static/images/bitcoin-shop-banner.png b/lnbits/static/images/bitcoin-shop-banner.png new file mode 100644 index 00000000..858c4174 Binary files /dev/null and b/lnbits/static/images/bitcoin-shop-banner.png differ diff --git a/lnbits/static/images/open-sats.png b/lnbits/static/images/open-sats.png new file mode 100644 index 00000000..daa051c4 Binary files /dev/null and b/lnbits/static/images/open-sats.png differ diff --git a/tests/wallets/fixtures/models.py b/tests/wallets/fixtures/models.py index 33ecf9fb..88067a2d 100644 --- a/tests/wallets/fixtures/models.py +++ b/tests/wallets/fixtures/models.py @@ -28,7 +28,6 @@ class TestMock(BaseModel): class Mock(FunctionMock, TestMock): - @staticmethod def combine_mocks(fs_mock, test_mock): _mock = fs_mock | test_mock diff --git a/tests/wallets/test_rest_wallets.py b/tests/wallets/test_rest_wallets.py index d4e4497c..dca8fc48 100644 --- a/tests/wallets/test_rest_wallets.py +++ b/tests/wallets/test_rest_wallets.py @@ -45,7 +45,6 @@ async def test_rest_wallet(httpserver: HTTPServer, test_data: WalletTest): def _apply_mock(httpserver: HTTPServer, mock: Mock): - request_data: Dict[str, Union[str, dict]] = {} request_type = getattr(mock.dict(), "request_type", None) # request_type = mock.request_type <--- this des not work for whatever reason!!!