update main branch to 0.11.0 (#1994 )

* [FIX] correct amount in fiat tracking (#1934) * better debug log * fix: convert msat to sat for fiat amount * [CHORE] update to version 0.11.0 (#1933) * [FIX] codeql for dev branch (#1935) * [FEAT] create data folder if it doesnt exist (#1930) * [FEAT] improve update_admin_settings (#1903) * [FEAT] improve update_admin_settings while working on the push notification pr i found it very hard just to update 2 settings inside the db, so i improved upon update_admin_settings. now you just need to provide a dict with key/values you want to update inside db. also debugging the endpoints for update_settings i found despite the type of `EditableSettings` fastapi did in fact pass a dict. * t * use `EditableSettings` as param in update_settings * fix settings model validation we previously overrode the pydantic validation with our own method * make `LnbitsSettings` a `BaseModel` and only add `BaseSettings` later this allows us to instantiate `EditableSettings` without the environment values being loaded in * add test * forbid extra fields in update api * fixup * add test * test datadir * move UpdateSettings * fix compat * fixup webpush --------- Co-authored-by: jacksn <jkranawetter05@gmail.com> * [TEST] use clean db in postgres tests (#1928) * [CORE] Document CoreLightningRestWallet (#1920) * document CoreLightningRestWallet * pushed to comment * fixed base64 comment --------- Co-authored-by: Ben <ben@arc.wales> * [TEST] use test data as mockdata (#1929) * add db group to cli * delete mock_data.zip * generate migration data through tests * [BUG] self payments for the same wallet (#1914) * [BUG] self payments for fakewallet make it possible to pay to yourself on fakewallet f * bugfix selfpayments for fakewallet * delete by wallet and fix previous_payment check (#1919) --------- Co-authored-by: callebtc <93376500+callebtc@users.noreply.github.com> * [REFACTOR] core/__init__ to not have circular import issues (#1876) * F541 fix remove unused workflow and combine linters into one add lnbits/static to ruff ignore remote setupnode ignore upgrades for mypy ignore F401 for __init__ files unused noqa ignore upgrades for black F821: undefine name disabled and logged webhook_listener for opennode and lnpay because they are obvisouly not working E402: module level import not at top of file fixup revert breaking changes wait for PR #1876 https://github.com/lnbits/lnbits/pull/1876 E721 fixes, only popped up for python3.9 not 3.10 [REFACTOR] core/__init__ to not have circular import issues WIP add db for backwards compat fix pyright make mypy happy again pyright did not catch those, i think mypy got confused with relative imports. maybe we should use absolute ones everywhere E402: module level import not at top of file dont forget to add core_app rebase on ruff pr f remo format * fix clnrest * ignore E402 in conftest * refactoring issues --------- Co-authored-by: jacksn <jkranawetter05@gmail.com> * make wallets name prettier! (#1918) * make wallets name prettier! * Update lnbits/core/templates/admin/index.html Co-authored-by: dni ⚡ <office@dnilabs.com> * Update lnbits/core/templates/admin/index.html Co-authored-by: dni ⚡ <office@dnilabs.com> --------- Co-authored-by: Arc <33088785+arcbtc@users.noreply.github.com> Co-authored-by: dni ⚡ <office@dnilabs.com> * Fix payments chart (#1851) * feat: payment history endpoint * test payment history * use new endpoint in frontend * refactor tests * [CHORE] bugfix formatting prettier (#1936) * do not show deleted wallets (#1942) * do not show deleted wallets * rename parameter for clarity * extension loader: do not panic! (#1945) * Revert "do not show deleted wallets (#1942)" (#1947) This reverts commit 1ee2d53069. * remove LNURL-p description_hash validation (#1951) * [CHORE] update dependencies, unsafe pip packages, fastapi (#1609) * d * middleware needs to be initialised before startup runs on python3.11 update secp256k1 update psycopg * update fastapi to v0.103 * fix webpush * bump dependencies * ruff issue * lock versions * bump versions --------- Co-authored-by: jacksn <jkranawetter05@gmail.com> * [FEAT] Focus cursor to textarea (#1959) * Focus cursor to textarea Fix need for additional click to textarea before pasting * [FEAT] autofocus textarea on paste request closes #1959 * format arba * bundle --------- Co-authored-by: dni ⚡ <office@dnilabs.com> * add editorconfig config, fix issues (only whitespace changes) (#1958) * adding bolt11 lib and removing bolt11.py from the codebase (#1817) * add latest bolt11 lib decode exception handling for create_payment fix json response for decode bugfix hexing description hash improvement on bolt11 lib update to bolt11 2.0.1 fix clnrest * bolt 2.0.4 * refactor core/crud.py * catch bolt11 erxception clnrest * Updated guide for extension development for current extension management process (#1962) * Startup optimization: nonblocking expiry check (#1943) * nonblocking expiry check * autoruff * smaller interval --------- Co-authored-by: dni ⚡ <office@dnilabs.com> * Support custom path for installed extensions (#1940) * feat: the more you fuck around the more you learn * feat: backwards compatible static file loading * refactor: update paths for extension files * refactor: var renaming * doc: update `LNBITS_EXTENSIONS_PATH` documentation * fix: default folder install * feat: install ext without external path * doc: `PYTHONPATH` no longer required * fix: add warnings * fix: missing path * refactor: re-order statements * fix: hardcoded path separator --------- Co-authored-by: dni ⚡ <office@dnilabs.com> * [FEAT] Node Managment (#1895) * [FEAT] Node Managment feat: node dashboard channels and transactions fix: update channel variables better types refactor ui add onchain balances and backend_name mock values for fake wallet remove app tab start implementing peers and channel management peer and channel management implement channel closing add channel states, better errors seperate payments and invoices on transactions tab display total channel balance feat: optional public page feat: show node address fix: port conversion feat: details dialog on transactions fix: peer info without alias fix: rename channel balances small improvements to channels tab feat: pagination on transactions tab test caching transactions refactor: move WALLET into wallets module fix: backwards compatibility refactor: move get_node_class to nodes modules post merge bundle fundle feat: disconnect peer feat: initial lnd support only use filtered channels for total balance adjust closing logic add basic node tests add setting for disabling transactions tab revert unnecessary changes add tests for invoices and payments improve payment and invoice implementations the previously used invoice fixture has a session scope, but a new invoice is required tests and bug fixes for channels api use query instead of body in channel delete delete requests should generally not use a body take node id through path instead of body for delete endpoint add peer management tests more tests for errors improve error handling rename id and pubkey to peer_id for consistency remove dead code fix http status codes make cache keys safer cache node public info comments for node settings rename node prop in frontend adjust tests to new status codes cln: use amount_msat instead of value for onchain balance turn transactions tab off by default enable transactions in tests only allow super user to create or delete fix prop name in admin navbar --------- Co-authored-by: jacksn <jkranawetter05@gmail.com> * [FEAT] cleanup GET /wallet endpoint, add wallet api routes (#1932) * [FEAT] cleanup GET /wallet endpoint, add wallet api route this removes the functionalitiy to create accounts and wallets via the GET /wallet endpoint in generic.py it add endpoints inside the api.py for it and the frontend is modified to use the api endpoints this also simplifies for the `feat/login` for the route. * remove stale generic tests and add api tests * bug wrong endpoint create account * vlad nitpick * added checkif deleted is 404 * reload after renaming wallet * another iteration with vlad * create new wallet if it none exist * fix delete refresh * formatting * Don't create user if allowed users is set (#1822) * dont allow creating of users when allowed users are set * add info to .env.example --------- Co-authored-by: dni ⚡ <office@dnilabs.com> * fix typos (#1969) * fix: node ranks (#1968) * [BUG] bundle is broken (#1972) * [BUG] Fix bad transation call (#1973) * fix: `:label="$('xxx')` to :label="$t('xxx') * chore: commit bundles * chore: remove extra file * fix: catch sse exceptions (#1971) * Add Markdown capability globally (#1965) * add markdown capability globally * add markdown to site description * add showdown to package.json remove it from vendor.json, its bundled * formatting * io * Update lnbits/core/templates/core/index.html --------- Co-authored-by: dni ⚡ <office@dnilabs.com> * feat: remove commit version (#1980) * nix: fix nixosModule and build (#1979) * lnbits/settings: get LNBITS_COMMIT from envvar if available There is no other way of setting the git commit at runtime, for build systems like Nix that allow you to hermetically define envvars derived from the source that will be available reproducibly at runtime * nix: update potree2nix and nixosModule This is a general refactor that gets everything building and passing the vmTest again * Update nix/modules/lnbits-service.nix --------- Co-authored-by: Pavol Rusnak <pavol@rusnak.io> * catch exceptions in migrations for extensions (#1987) * fix: admin_ui js error (#1982) * fix: admin_ui js error undefined formData.lnbits_allowed_currencies JS error in console * vlad suggestion * update: to 0.11.1 * revert: update --------- Co-authored-by: jackstar12 <62219658+jackstar12@users.noreply.github.com> Co-authored-by: dni ⚡ <office@dnilabs.com> Co-authored-by: jacksn <jkranawetter05@gmail.com> Co-authored-by: Ben <ben@arc.wales> Co-authored-by: Tiago Vasconcelos <talvasconcelos@gmail.com> Co-authored-by: Arc <33088785+arcbtc@users.noreply.github.com> Co-authored-by: arbadacarba <63317640+arbadacarbaYK@users.noreply.github.com> Co-authored-by: Pavol Rusnak <pavol@rusnak.io> Co-authored-by: blackcoffeexbt <87530449+blackcoffeexbt@users.noreply.github.com> Co-authored-by: Vlad Stan <stan.v.vlad@gmail.com> Co-authored-by: Matthew Croughan <matt@croughan.sh>
2023-10-05 10:52:57 +02:00
205 changed files with 5014 additions and 16184 deletions
@@ -1,17 +1,72 @@
 #For more information on .env files, their content and format: https://pypi.org/project/python-dotenv/

-######################################
-########### Admin Settings ###########
-######################################
+HOST=127.0.0.1
+PORT=5000

-# Enable Admin GUI, available for the first user in LNBITS_ADMIN_USERS if available.
-# Warning: Enabling this will make LNbits ignore most configurations in file. Only the
-# configurations defined in `ReadOnlySettings` will still be read from the environment variables.
-# The rest of the settings will be stored in your database and you will be able to change them
-# only  through the Admin UI.
+# uvicorn variable, uncomment to allow https behind a proxy
+# FORWARDED_ALLOW_IPS="*"
+
+DEBUG=false
+
+# Server security, rate limiting ips, blocked ips, allowed ips
+LNBITS_RATE_LIMIT_NO="200"
+LNBITS_RATE_LIMIT_UNIT="minute"
+LNBITS_ALLOWED_IPS=""
+LNBITS_BLOCKED_IPS=""
+
+# Allow users and admins by user IDs (comma separated list)
+# if set new users will not be able to create accounts
+LNBITS_ALLOWED_USERS=""
+LNBITS_ADMIN_USERS=""
+# Extensions only admin can access
+LNBITS_ADMIN_EXTENSIONS="ngrok, admin"
+
+# Enable Admin GUI, available for the first user in LNBITS_ADMIN_USERS if available
+# Warning: Enabling this will make LNbits ignore this configuration file. Your settings will
+# be stored in your database and you will be able to change them only through the Admin UI.
 # Disable this to make LNbits use this config file again.
 LNBITS_ADMIN_UI=false

+LNBITS_DEFAULT_WALLET_NAME="LNbits wallet"
+
+# Ad space description
+# LNBITS_AD_SPACE_TITLE="Supported by"
+# csv ad space, format "<url>;<img-light>;<img-dark>, <url>;<img-light>;<img-dark>", extensions can choose to honor
+# LNBITS_AD_SPACE="https://shop.lnbits.com/;https://raw.githubusercontent.com/lnbits/lnbits/main/lnbits/static/images/lnbits-shop-light.png;https://raw.githubusercontent.com/lnbits/lnbits/main/lnbits/static/images/lnbits-shop-dark.png"
+
+# Hides wallet api, extensions can choose to honor
+LNBITS_HIDE_API=false
+
+# LNBITS_EXTENSIONS_MANIFESTS="https://raw.githubusercontent.com/lnbits/lnbits-extensions/main/extensions.json,https://raw.githubusercontent.com/lnbits/lnbits-extensions/main/extensions-trial.json"
+# GitHub has rate-limits for its APIs. The limit can be increased specifying a GITHUB_TOKEN
+# LNBITS_EXT_GITHUB_TOKEN=github_pat_xxxxxxxxxxxxxxxxxx
+
+# Path where extensions will be installed (defaults to `./lnbits/`).
+# Inside this directory the `extensions` and `upgrades` sub-directories will be created.
+# LNBITS_EXTENSIONS_PATH="/path/to/some/dir"
+
+
+# Extensions to be installed by default. If an extension from this list is uninstalled then it will be re-installed on the next restart.
+# The extension must be removed from this list in order to not be re-installed.
+LNBITS_EXTENSIONS_DEFAULT_INSTALL="tpos"
+
+# Database: to use SQLite, specify LNBITS_DATA_FOLDER
+#           to use PostgreSQL, specify LNBITS_DATABASE_URL=postgres://...
+#           to use CockroachDB, specify LNBITS_DATABASE_URL=cockroachdb://...
+# for both PostgreSQL and CockroachDB, you'll need to install
+#   psycopg2 as an additional dependency
+LNBITS_DATA_FOLDER="./data"
+# LNBITS_DATABASE_URL="postgres://user:password@host:port/databasename"
+
+LNBITS_SERVICE_FEE="0.0"
+# value in millisats
+LNBITS_RESERVE_FEE_MIN=2000
+# value in percent
+LNBITS_RESERVE_FEE_PERCENT=1.0
+
+# Limit fiat currencies allowed to see in UI
+# LNBITS_ALLOWED_CURRENCIES="EUR, USD"
+
 # Change theme
 LNBITS_SITE_TITLE="LNbits"
 LNBITS_SITE_TAGLINE="free and open-source lightning wallet"
@@ -20,15 +75,8 @@ LNBITS_SITE_DESCRIPTION="Some description about your service, will display if ti
 LNBITS_THEME_OPTIONS="classic, bitcoin, flamingo, freedom, mint, autumn, monochrome, salvador, cyber"
 # LNBITS_CUSTOM_LOGO="https://lnbits.com/assets/images/logo/logo.svg"

-HOST=127.0.0.1
-PORT=5000
-
-######################################
-########## Funding Source ############
-######################################
-
 # which fundingsources are allowed in the admin ui
-LNBITS_ALLOWED_FUNDING_SOURCES="VoidWallet, FakeWallet, CoreLightningWallet, CoreLightningRestWallet, LndRestWallet, EclairWallet, LndWallet, LnTipsWallet, LNPayWallet, LNbitsWallet, AlbyWallet, ZBDWallet, OpenNodeWallet"
+LNBITS_ALLOWED_FUNDING_SOURCES="VoidWallet, FakeWallet, CoreLightningWallet, CoreLightningRestWallet, LndRestWallet, EclairWallet, LndWallet, LnTipsWallet, LNPayWallet, LNbitsWallet, OpenNodeWallet"

 LNBITS_BACKEND_WALLET_CLASS=VoidWallet
 # VoidWallet is just a fallback that works without any actual Lightning capabilities,
@@ -51,7 +99,8 @@ CORELIGHTNING_RPC="/home/bob/.lightning/bitcoin/lightning-rpc"

 # CoreLightningRestWallet
 CORELIGHTNING_REST_URL=http://127.0.0.1:8185/
-CORELIGHTNING_REST_MACAROON="/path/to/clnrest/access.macaroon"  # or BASE64/HEXSTRING
+# Path or BASE64/HEX STRING
+CORELIGHTNING_REST_MACAROON="/path/to/clnrest/access.macaroon"
 CORELIGHTNING_REST_CERT="/path/to/clnrest/tls.cert"

 # LnbitsWallet
@@ -61,15 +110,15 @@ LNBITS_KEY=LNBITS_ADMIN_KEY
 # LndWallet
 LND_GRPC_ENDPOINT=127.0.0.1
 LND_GRPC_PORT=10009
-LND_GRPC_CERT="/home/bob/.lnd/tls.cert"
-LND_GRPC_MACAROON="/home/bob/.lnd/data/chain/bitcoin/mainnet/admin.macaroon"  # or HEXSTRING
+LND_GRPC_CERT="/home/bob/.config/Zap/lnd/bitcoin/mainnet/wallet-1/data/chain/bitcoin/mainnet/tls.cert"
+LND_GRPC_MACAROON="/home/bob/.config/Zap/lnd/bitcoin/mainnet/wallet-1/data/chain/bitcoin/mainnet/admin.macaroon or HEXSTRING"
 # To use an AES-encrypted macaroon, set
 # LND_GRPC_MACAROON="eNcRyPtEdMaCaRoOn"

 # LndRestWallet
 LND_REST_ENDPOINT=https://127.0.0.1:8080/
-LND_REST_CERT="/home/bob/.lnd/tls.cert"
-LND_REST_MACAROON="/home/bob/.lnd/data/chain/bitcoin/mainnet/admin.macaroon"  # or HEXSTRING
+LND_REST_CERT="/home/bob/.config/Zap/lnd/bitcoin/mainnet/wallet-1/data/chain/bitcoin/mainnet/tls.cert"
+LND_REST_MACAROON="/home/bob/.config/Zap/lnd/bitcoin/mainnet/wallet-1/data/chain/bitcoin/mainnet/admin.macaroon or HEXSTRING"
 # To use an AES-encrypted macaroon, set
 # LND_REST_MACAROON_ENCRYPTED="eNcRyPtEdMaCaRoOn"

@@ -80,14 +129,6 @@ LNPAY_API_KEY=LNPAY_API_KEY
 # Wallet Admin in Wallet Access Keys
 LNPAY_WALLET_KEY=LNPAY_ADMIN_KEY

-# AlbyWallet
-ALBY_API_ENDPOINT=https://api.getalby.com/
-ALBY_ACCESS_TOKEN=ALBY_ACCESS_TOKEN
-
-# ZBDWallet
-ZBD_API_ENDPOINT=https://api.zebedee.io/v0/
-ZBD_API_KEY=ZBD_ACCESS_TOKEN
-
 # OpenNodeWallet
 OPENNODE_API_ENDPOINT=https://api.opennode.com/
 OPENNODE_KEY=OPENNODE_ADMIN_KEY
@@ -104,139 +145,3 @@ ECLAIR_PASS=eclairpw
 # Enter /api in LightningTipBot to get your key
 LNTIPS_API_KEY=LNTIPS_ADMIN_KEY
 LNTIPS_API_ENDPOINT=https://ln.tips
-
-######################################
-####### Auth Configurations ##########
-######################################
-# Secret Key: will default to the hash of the super user. It is strongly recommended that you set your own value.
-AUTH_SECRET_KEY=""
-AUTH_TOKEN_EXPIRE_MINUTES=525600
-# Possible authorization methods: user-id-only, username-password, google-auth, github-auth, keycloak-auth
-AUTH_ALLOWED_METHODS="user-id-only, username-password"
-# Set this flag if HTTP is used for OAuth
-# OAUTHLIB_INSECURE_TRANSPORT="1"
-
-# Google OAuth Config
-# Make sure that the authorized redirect URIs contain https://{domain}/api/v1/auth/google/token
-GOOGLE_CLIENT_ID=""
-GOOGLE_CLIENT_SECRET=""
-
-# GitHub OAuth Config
-# Make sure that the authorization callback URL is set to https://{domain}/api/v1/auth/github/token
-GITHUB_CLIENT_ID=""
-GITHUB_CLIENT_SECRET=""
-
-# Keycloak OAuth Config
-# Make sure that the valid redirect URIs contain https://{domain}/api/v1/auth/keycloak/token
-KEYCLOAK_CLIENT_ID=""
-KEYCLOAK_CLIENT_SECRET=""
-KEYCLOAK_DISCOVERY_URL=""
-
-
-######################################
-
-# uvicorn variable, uncomment to allow https behind a proxy
-# IMPORTANT: this also needs the webserver to be configured to forward the headers
-# http://docs.lnbits.org/guide/installation.html#running-behind-an-apache2-reverse-proxy-over-https
-# FORWARDED_ALLOW_IPS="*"
-
-# Server security, rate limiting ips, blocked ips, allowed ips
-LNBITS_RATE_LIMIT_NO="200"
-LNBITS_RATE_LIMIT_UNIT="minute"
-LNBITS_ALLOWED_IPS=""
-LNBITS_BLOCKED_IPS=""
-
-# Allow users and admins by user IDs (comma separated list)
-# if set new users will not be able to create accounts
-LNBITS_ALLOWED_USERS=""
-LNBITS_ADMIN_USERS=""
-# ID of the super user. The user ID must exist.
-# SUPER_USER=""
-
-# Extensions only admin can access
-LNBITS_ADMIN_EXTENSIONS="ngrok, admin"
-
-# Start LNbits core only. The extensions are not loaded.
-# LNBITS_EXTENSIONS_DEACTIVATE_ALL=true
-
-# Disable account creation for new users
-# LNBITS_ALLOW_NEW_ACCOUNTS=false
-
-# Enable Node Management without activating the LNBITS Admin GUI
-# by setting the following variables to true.
-LNBITS_NODE_UI=false
-LNBITS_PUBLIC_NODE_UI=false
-# Enabling the transactions tab can cause crashes on large Core Lightning nodes.
-LNBITS_NODE_UI_TRANSACTIONS=false
-
-LNBITS_DEFAULT_WALLET_NAME="LNbits wallet"
-
-# Ad space description
-# LNBITS_AD_SPACE_TITLE="Supported by"
-# csv ad space, format "<url>;<img-light>;<img-dark>, <url>;<img-light>;<img-dark>", extensions can choose to honor
-# LNBITS_AD_SPACE="https://shop.lnbits.com/;https://raw.githubusercontent.com/lnbits/lnbits/main/lnbits/static/images/lnbits-shop-light.png;https://raw.githubusercontent.com/lnbits/lnbits/main/lnbits/static/images/lnbits-shop-dark.png"
-
-# Hides wallet api, extensions can choose to honor
-LNBITS_HIDE_API=false
-
-# LNBITS_EXTENSIONS_MANIFESTS="https://raw.githubusercontent.com/lnbits/lnbits-extensions/main/extensions.json,https://raw.githubusercontent.com/lnbits/lnbits-extensions/main/extensions-trial.json"
-# GitHub has rate-limits for its APIs. The limit can be increased specifying a GITHUB_TOKEN
-# LNBITS_EXT_GITHUB_TOKEN=github_pat_xxxxxxxxxxxxxxxxxx
-
-# Path where extensions will be installed (defaults to `./lnbits/`).
-# Inside this directory the `extensions` and `upgrades` sub-directories will be created.
-# LNBITS_EXTENSIONS_PATH="/path/to/some/dir"
-
-# Extensions to be installed by default. If an extension from this list is uninstalled then it will be re-installed on the next restart.
-# The extension must be removed from this list in order to not be re-installed.
-LNBITS_EXTENSIONS_DEFAULT_INSTALL="tpos"
-
-# Database: to use SQLite, specify LNBITS_DATA_FOLDER
-#           to use PostgreSQL, specify LNBITS_DATABASE_URL=postgres://...
-#           to use CockroachDB, specify LNBITS_DATABASE_URL=cockroachdb://...
-# for both PostgreSQL and CockroachDB, you'll need to install
-#   psycopg2 as an additional dependency
-LNBITS_DATA_FOLDER="./data"
-# LNBITS_DATABASE_URL="postgres://user:password@host:port/databasename"
-
-# the service fee (in percent)
-LNBITS_SERVICE_FEE=0.0
-# the wallet where fees go to
-# LNBITS_SERVICE_FEE_WALLET=
-# the maximum fee per transaction (in satoshis)
-# LNBITS_SERVICE_FEE_MAX=1000
-# disable fees for internal transactions
-# LNBITS_SERVICE_FEE_IGNORE_INTERNAL=true
-
-# value in millisats
-LNBITS_RESERVE_FEE_MIN=2000
-# value in percent
-LNBITS_RESERVE_FEE_PERCENT=1.0
-
-# limit the maximum balance for each wallet
-# throw an error if the wallet attempts to create a new invoice
-
-# LNBITS_WALLET_LIMIT_MAX_BALANCE=1000000
-# LNBITS_WALLET_LIMIT_DAILY_MAX_WITHDRAW=1000000
-# LNBITS_WALLET_LIMIT_SECS_BETWEEN_TRANS=60
-
-# Limit fiat currencies allowed to see in UI
-# LNBITS_ALLOWED_CURRENCIES="EUR, USD"
-
-######################################
-###### Logging and Development #######
-######################################
-
-DEBUG=false
-DEBUG_DATABASE=false
-BUNDLE_ASSETS=true
-
-# logging into LNBITS_DATA_FOLDER/logs/
-ENABLE_LOG_TO_FILE=true
-
-# https://loguru.readthedocs.io/en/stable/api/logger.html#file
-LOG_ROTATION="100 MB"
-LOG_RETENTION="3 months"
-
-# for database cleanup commands
-# CLEANUP_WALLETS_DAYS=90
@@ -7,10 +7,10 @@ inputs:
    default: "3.9"
  poetry-version:
    description: "Poetry Version"
-    default: "1.7.0"
+    default: "1.5.1"
  node-version:
    description: "Node Version"
-    default: "20.x"
+    default: "18.x"
  npm:
    description: "use npm"
    default: false
@@ -21,7 +21,7 @@ runs:
  using: "composite"
  steps:
    - name: Set up Python ${{ inputs.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
      with:
        python-version: ${{ inputs.python-version }}
        # cache poetry install via pip
@@ -38,7 +38,7 @@ runs:
        poetry config virtualenvs.create true --local
        poetry config virtualenvs.in-project true --local

-    - uses: actions/cache@v4
+    - uses: actions/cache@v3
      name: Define a cache for the virtual environment based on the dependencies lock file
      with:
        path: ./.venv
@@ -50,11 +50,11 @@ runs:

    - name: Use Node.js ${{ inputs.node-version }}
      if: ${{ (inputs.npm == 'true') }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v3
      with:
        node-version: ${{ inputs.node-version }}

-    - uses: actions/cache@v4
+    - uses: actions/cache@v3
      if: ${{ (inputs.npm == 'true') }}
      name: Define a cache for the npm based on the dependencies lock file
      with:
@@ -1,11 +1,5 @@
 name: LNbits CI
-on:
-  push:
-    branches:
-      - main
-      - dev
-  pull_request:
-
+on: [push, pull_request]

 jobs:

@@ -21,18 +15,16 @@ jobs:
    uses: ./.github/workflows/tests.yml
    with:
      python-version: ${{ matrix.python-version }}
-      db-url: ${{ matrix.db-url }}
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

-  migration:
+  migrations:
    needs: [ lint ]
    strategy:
      matrix:
-        python-version: ["3.9", "3.10"]
-    uses: ./.github/workflows/migration.yml
+        python-version: ["3.9"]
+    uses: ./.github/workflows/tests.yml
    with:
-      python-version: ${{ matrix.python-version }}
+      make: test-migration
+      db-name: migration

  openapi:
    needs: [ lint ]
@@ -40,6 +32,9 @@ jobs:
    with:
      make: openapi

+  # docker:
+  #   uses: ./.github/workflows/docker.yml
+
  regtest:
    needs: [ lint ]
    uses: ./.github/workflows/regtest.yml
@@ -50,16 +45,3 @@ jobs:
    with:
      python-version: ${{ matrix.python-version }}
      backend-wallet-class: ${{ matrix.backend-wallet-class }}
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
-  jmeter:
-    needs: [ lint ]
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-        poetry-version: ["1.5.1"]
-    uses: ./.github/workflows/jmeter.yml
-    with:
-      python-version: ${{ matrix.python-version }}
-      poetry-version: ${{ matrix.poetry-version }}
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 2
      - run: git checkout HEAD^2
@@ -1,53 +1,20 @@
 name: docker

 on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        default: latest
-        type: string
  workflow_call:
-    inputs:
-      tag:
-        default: latest
-        type: string
-    secrets:
-      DOCKER_USERNAME:
-        required: true
-      DOCKER_PASSWORD:
-        required: true

 jobs:
-  push_to_dockerhub:
+  docker:
    runs-on: ubuntu-latest
    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
+      - uses: actions/checkout@v3
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Cache Docker layers
-        uses: actions/cache@v4
-        id: cache
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
+        uses: docker/setup-buildx-action@v2
      - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v4
        with:
            context: .
-            push: true
-            tags: ${{ secrets.DOCKER_USERNAME }}/lnbits:${{ inputs.tag }}
-            platforms: linux/amd64,linux/arm64
-            cache-from: type=local,src=/tmp/.buildx-cache
-            cache-to: type=local,dest=/tmp/.buildx-cache
+            push: false
+            tags: lnbitsdocker/lnbits-legend:latest
+            cache-from: type=registry,ref=lnbitsdocker/lnbits-legend:latest
+            cache-to: type=inline
@@ -1,53 +0,0 @@
-name: JMeter Extension Tests
-
-on:
-  workflow_call:
-    inputs:
-      python-version:
-        description: "Python Version"
-        required: true
-        default: "3.9"
-        type: string
-      poetry-version:
-        description: "Poetry Version"
-        required: true
-        default: "1.5.1"
-        type: string
-
-jobs:
-  jmeter:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: ./.github/actions/prepare
-        with:
-          python-version: ${{ inputs.python-version }}
-
-      - name: run LNbits
-        env:
-          LNBITS_ADMIN_UI: true
-          LNBITS_EXTENSIONS_DEFAULT_INSTALL: "watchonly, satspay, tipjar, tpos, lnurlp, withdraw"
-          LNBITS_BACKEND_WALLET_CLASS: FakeWallet
-        run: |
-          poetry run lnbits &
-          sleep 5
-
-      - name: clone lnbits-extensions, install jmeter and run tests
-        run: |
-          git clone https://github.com/lnbits/lnbits-extensions
-          cd lnbits-extensions
-          mkdir logs
-          mkdir reports
-          make install-jmeter
-          make start-mirror-server
-          make test
-
-      - name: upload jmeter test results
-        uses: actions/upload-artifact@v4
-        if: ${{ always() }}
-        with:
-          name: jmeter-extension-test-results
-          path: |
-            lnbits-extensions/reports/
-            lnbits-extensions/logs/
@@ -3,53 +3,25 @@ on:
  workflow_call:

 jobs:
-
  black:
    uses: ./.github/workflows/make.yml
-    strategy:
-      matrix:
-        python-version: ["3.9", "3.10"]
    with:
      make: checkblack
-      python-version: ${{ matrix.python-version }}
-
  ruff:
    uses: ./.github/workflows/make.yml
-    strategy:
-      matrix:
-        python-version: ["3.9", "3.10"]
    with:
      make: checkruff
-      python-version: ${{ matrix.python-version }}
-
  mypy:
    uses: ./.github/workflows/make.yml
-    strategy:
-      matrix:
-        python-version: ["3.9", "3.10"]
    with:
      make: mypy
-      python-version: ${{ matrix.python-version }}
-
  pyright:
    uses: ./.github/workflows/make.yml
-    strategy:
-      matrix:
-        python-version: ["3.9", "3.10"]
    with:
      make: pyright
-      python-version: ${{ matrix.python-version }}
      npm: true
-
-
  prettier:
    uses: ./.github/workflows/make.yml
    with:
-      make: checkprettier
-      npm: true
-
-  bundle:
-    uses: ./.github/workflows/make.yml
-    with:
-      make: checkbundle
+      make: prettier
      npm: true
@@ -11,24 +11,21 @@ on:
        description: "use npm install"
        default: false
        type: boolean
-      python-version:
-        description: "python version"
-        type: string
-        default: "3.10"

 jobs:
  make:
-    name: ${{ inputs.make }} (${{ inputs.python-version }})
+    name: ${{ inputs.make }} (${{ matrix.python-version }})
    strategy:
      matrix:
        os-version: ["ubuntu-latest"]
+        python-version: ["3.9", "3.10"]
        node-version: ["18.x"]
    runs-on: ${{ matrix.os-version }}
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: ./.github/actions/prepare
        with:
-          python-version: ${{ inputs.python-version }}
+          python-version: ${{ matrix.python-version }}
          node-version: ${{ matrix.node-version }}
          npm: ${{ inputs.npm }}
      - run: make ${{ inputs.make }}
@@ -1,37 +0,0 @@
-name: migration
-
-on:
-  workflow_call:
-    inputs:
-      python-version:
-        description: "python version"
-        type: string
-        default: "3.10"
-
-jobs:
-  make:
-    name: migration (${{ inputs.python-version }})
-    strategy:
-      matrix:
-        os-version: ["ubuntu-latest"]
-    runs-on: ${{ matrix.os-version }}
-    services:
-      postgres:
-        image: postgres:latest
-        env:
-          POSTGRES_USER: lnbits
-          POSTGRES_PASSWORD: lnbits
-          POSTGRES_DB: migration
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/prepare
-        with:
-          python-version: ${{ inputs.python-version }}
-      - run: make test-migration
@@ -1,41 +0,0 @@
-name: LNbits CI / nix
-
-# - run   : on main, dev, nix and cachix branches when relevant files change
-# - cache : on main, dev and cachix branches when relevant files change
-
-on:
-  push:
-    branches:
-      - main
-      - dev
-      - nix
-      - cachix
-    paths:
-      - 'flake.nix'
-      - 'flake.lock'
-      - 'pyproject.toml'
-      - 'poetry.lock'
-      - '.github/workflows/nix.yml'
-  pull_request:
-    paths:
-      - 'flake.nix'
-      - 'flake.lock'
-      - 'pyproject.toml'
-      - 'poetry.lock'
-
-jobs:
-  nix:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v24
-        with:
-          nix_path: nixpkgs=channel:nixos-23.11
-      - uses: cachix/cachix-action@v13
-        if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/cachix'
-        with:
-          name: lnbits
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-      - run: nix build -L
-      - run: cachix push lnbits ./result
-        if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/cachix'
@@ -0,0 +1,69 @@
+name: Build and push Docker image on tag
+
+env:
+  DOCKER_CLI_EXPERIMENTAL: enabled
+
+on:
+  push:
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+-*"
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    name: Build and push lnbits image
+    steps:
+      - name: Login to Docker Hub
+        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+
+      - name: Checkout project
+        uses: actions/checkout@v3
+
+      - name: Import environment variables
+        id: import-env
+        shell: bash
+        run: echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+
+      - name: Show set environment variables
+        run: |
+          printf "    TAG: %s\n"  "$TAG"
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        id: qemu
+
+      - name: Setup Docker buildx action
+        uses: docker/setup-buildx-action@v1
+        id: buildx
+
+      - name: Show available Docker buildx platforms
+        run: echo ${{ steps.buildx.outputs.platforms }}
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        id: cache
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Run Docker buildx against tag
+        run: |
+            docker buildx build \
+            --cache-from "type=local,src=/tmp/.buildx-cache" \
+            --cache-to "type=local,dest=/tmp/.buildx-cache" \
+            --platform linux/amd64,linux/arm64 \
+            --tag ${{ secrets.DOCKER_USERNAME }}/lnbits-legend:${TAG} \
+            --output "type=registry" ./
+
+      - name: Run Docker buildx against latest
+        run: |
+            docker buildx build \
+            --cache-from "type=local,src=/tmp/.buildx-cache" \
+            --cache-to "type=local,dest=/tmp/.buildx-cache" \
+            --platform linux/amd64,linux/arm64 \
+            --tag ${{ secrets.DOCKER_USERNAME }}/lnbits-legend:latest \
+            --output "type=registry" ./
@@ -15,29 +15,26 @@ on:
      backend-wallet-class:
        required: true
        type: string
-    secrets:
-      CODECOV_TOKEN:
-        required: true

 jobs:
  regtest:
    runs-on: ${{ inputs.os-version }}
    timeout-minutes: 10
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3

      - name: Set up Docker Buildx
        if: ${{ inputs.backend-wallet-class == 'LNbitsWallet' }}
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2

      - name: Build and push
        if: ${{ inputs.backend-wallet-class == 'LNbitsWallet' }}
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v4
        with:
            context: .
            push: false
-            tags: lnbits/lnbits:latest
-            cache-from: type=registry,ref=lnbits/lnbits:latest
+            tags: lnbitsdocker/lnbits-legend:latest
+            cache-from: type=registry,ref=lnbitsdocker/lnbits-legend:latest
            cache-to: type=inline

      - name: Setup Regtest
@@ -54,10 +51,9 @@ jobs:

      - name: Create fake admin
        if: ${{ inputs.backend-wallet-class == 'LNbitsWallet' }}
-        run: docker exec lnbits-lnbits-1 poetry run python tools/create_fake_admin.py
+        run: docker exec lnbits-legend-lnbits-1 poetry run python tools/create_fake_admin.py

-      - name: Run pytest
-        uses: pavelzw/pytest-action@v2
+      - name: Run Tests
        env:
          LNBITS_DATABASE_URL: ${{ inputs.db-url }}
          LNBITS_BACKEND_WALLET_CLASS: ${{ inputs.backend-wallet-class }}
@@ -76,20 +72,10 @@ jobs:
          LNBITS_KEY: "d08a3313322a4514af75d488bcc27eee"
          ECLAIR_URL: http://127.0.0.1:8082
          ECLAIR_PASS: lnbits
-          LNBITS_DATA_FOLDER: "./tests/data"
-          PYTHONUNBUFFERED: 1
-          DEBUG: true
-        with:
-          verbose: false
-          job-summary: true
-          emoji: false
-          click-to-expand: false
-          custom-pytest: poetry run pytest
-          report-title: "regtest (${{ inputs.python-version }}, ${{ inputs.backend-wallet-class }}"
+        run: make test-real-wallet

      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v3
        with:
-          file: ./coverage.xml
          token: ${{ secrets.CODECOV_TOKEN }}
-          verbose: true
+          file: ./coverage.xml
@@ -1,31 +0,0 @@
-name: release
-
-on:
-  push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
-      - "[0-9]+.[0-9]+.[0-9]+"
-
-permissions:
-  contents: write
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Create github release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref_name }}
-        run: |
-          gh release create "$tag" --generate-notes --draft
-
-  docker:
-    needs: [ release ]
-    uses: ./.github/workflows/docker.yml
-    with:
-      tag: ${{ github.ref_name }}
-    secrets:
-      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
@@ -3,6 +3,9 @@ name: tests
 on:
  workflow_call:
    inputs:
+      make:
+        default: test
+        type: string
      python-version:
        default: "3.9"
        type: string
@@ -15,9 +18,6 @@ on:
      db-name:
        default: "lnbits"
        type: string
-    secrets:
-      CODECOV_TOKEN:
-        required: true

 jobs:
  tests:
@@ -39,32 +39,20 @@ jobs:
          --health-retries 5

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3

      - uses: ./.github/actions/prepare
        with:
          python-version: ${{ inputs.python-version }}

-      - name: Run pytest
-        uses: pavelzw/pytest-action@v2
+      - name: Run Tests
        env:
          LNBITS_DATABASE_URL: ${{ inputs.db-url }}
          LNBITS_BACKEND_WALLET_CLASS: FakeWallet
-          FAKE_WALLET_SECRET: "ToTheMoon1"
-          LNBITS_DATA_FOLDER: "./tests/data"
-          PYTHONUNBUFFERED: 1
-          DEBUG: true
-        with:
-          verbose: false
-          job-summary: true
-          emoji: false
-          click-to-expand: false
-          custom-pytest: poetry run pytest
-          report-title: "test (${{ inputs.python-version }}, ${{ inputs.db-url }})"
+        run: make ${{ inputs.make }}

      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v3
        with:
-          file: ./coverage.xml
          token: ${{ secrets.CODECOV_TOKEN }}
-          verbose: false
+          file: ./coverage.xml
@@ -11,7 +11,6 @@ __pycache__
 *.egg
 *.egg-info
 .coverage
-.coverage.*
 .pytest_cache
 .webassets-cache
 htmlcov
@@ -36,8 +35,6 @@ coverage.xml
 node_modules
 lnbits/static/bundle.js
 lnbits/static/bundle.css
-lnbits/static/bundle.min.js.old
-lnbits/static/bundle.min.css.old
 docker

 # Nix
@@ -14,11 +14,11 @@ repos:
      - id: mixed-line-ending
      - id: check-case-conflict
  - repo: https://github.com/psf/black
-    rev: 24.2.0
+    rev: 23.7.0
    hooks:
      - id: black
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.2
+    rev: v0.0.283
    hooks:
      - id: ruff
        args: [ --fix, --exit-non-zero-on-fix ]
@@ -2,7 +2,7 @@ FROM python:3.10-slim-bullseye

 RUN apt-get clean
 RUN apt-get update
-RUN apt-get install -y curl pkg-config build-essential libnss-myhostname
+RUN apt-get install -y curl pkg-config build-essential

 RUN curl -sSL https://install.python-poetry.org | python3 -
 ENV PATH="/root/.local/bin:$PATH"
@@ -4,7 +4,7 @@ all: format check

 format: prettier black ruff

-check: mypy pyright checkblack checkruff checkprettier checkbundle
+check: mypy pyright checkblack checkruff checkprettier

 prettier:
 	poetry run ./node_modules/.bin/prettier --write lnbits
@@ -96,16 +96,9 @@ bundle:
 	npm run vendor_minify_css
 	npm run vendor_bundle_js
 	npm run vendor_minify_js
-
-checkbundle:
-	cp lnbits/static/bundle.min.js lnbits/static/bundle.min.js.old
-	cp lnbits/static/bundle.min.css lnbits/static/bundle.min.css.old
-	make bundle
-	diff -q lnbits/static/bundle.min.js lnbits/static/bundle.min.js.old || exit 1
-	diff -q lnbits/static/bundle.min.css lnbits/static/bundle.min.css.old || exit 1
-	@echo "Bundle is OK"
-	rm lnbits/static/bundle.min.js.old
-	rm lnbits/static/bundle.min.css.old
+	# increment serviceworker version
+	sed -i -e "s/CACHE_VERSION =.*/CACHE_VERSION = $$(awk '/CACHE_VERSION =/ { print 1+$$4 }' lnbits/core/static/js/service-worker.js)/" \
+		lnbits/core/static/js/service-worker.js

 install-pre-commit-hook:
 	@echo "Installing pre-commit hook to git"
@@ -1,22 +1,17 @@
+# LNbits

-<picture >
-  <source media="(prefers-color-scheme: dark)" srcset="https://i.imgur.com/QE6SIrs.png"  style="width:300px">
-  <img src="https://i.imgur.com/fyKPgVT.png" style="width:300px">
-</picture>
+[![license-badge]](LICENSE)
+[![docs-badge]][docs]

-<b>(BETA)</b> 
+![Lightning network wallet](https://i.imgur.com/EHvK6Lq.png)

-[![license-badge]](LICENSE) [![docs-badge]][docs]
-
-![Lightning network wallet](https://i.imgur.com/DeIiO0y.png)
-
-# The world's most powerful suite of bitcoin tools.
-
-## Run for yourself, for others, or as part of a stack. 
+# LNbits v0.10 BETA, free and open-source Lightning wallet accounts system

 (Join us on [https://t.me/lnbits](https://t.me/lnbits))

-LNbits is beta, for responsible disclosure of any concerns please contact an admin in [https://t.me/lnbits](https://t.me/lnbits)
+LNbits is beta, for responsible disclosure of any concerns please contact lnbits@pm.me
+
+Use [legend.lnbits.com](https://legend.lnbits.com), or run your own LNbits server!

 LNbits is a Python server that sits on top of any funding source. It can be used as:

@@ -26,9 +21,9 @@ LNbits is a Python server that sits on top of any funding source. It can be used
 - Fallback wallet for the LNURL scheme
 - Instant wallet for LN demonstrations

-LNbits can run on top of almost all Lightning funding sources.
+LNbits can run on top of any Lightning funding source. It supports LND, CLN, Eclair, Spark, LNpay, OpenNode, LightningTipBot, and with more being added regularly.

-See [LNbits manual](https://docs.lnbits.org/guide/wallets.html) for more detailed documentation about each funding source.
+See [LNbits Wiki](https://github.com/lnbits/lnbits/wiki/) for more detailed documentation.

 Checkout the LNbits [YouTube](https://www.youtube.com/playlist?list=PLPj3KCksGbSYG0ciIQUWJru1dWstPHshe) video series.

@@ -36,41 +31,36 @@ LNbits is inspired by all the great work of [opennode.com](https://www.opennode.

 ## Running LNbits

-Test on our demo server [legend.lnbits.com](https://legend.lnbits.com), or on [lnbits.com](https://lnbits.com) software as a service, where you can spin up an LNbits instance for 21sats per hr.
-
 See the [install guide](https://github.com/lnbits/lnbits/blob/main/docs/guide/installation.md) for details on installation and setup.

-## LNbits account system
+## LNbits as an account system

-LNbits is packaged with tools to help manage funds, such as a table of transactions, line chart of spending, export to csv. Each wallet also comes with its own API keys, to help partition the exposure of your funding source.
+LNbits is packaged with tools to help manage funds, such as a table of transactions, line chart of spending, export to csv + more to come..

-<img src="https://i.imgur.com/w8jdGpF.png" style="width:800px">
+![Lightning network wallet](https://i.imgur.com/w8jdGpF.png)

-## LNbits extension universe
+Each wallet also comes with its own API keys, to help partition the exposure of your funding source.

-Extend YOUR LNbits to meet YOUR needs.
+(LNbits M5StackSats available here https://github.com/arcbtc/M5StackSats)

-All non-core features are installed as extensions, reducing your code base and making your LNbits unique to you. Extend your LNbits install in any direction, and even create and share your own extensions. 
+![lnurl ATM](https://i.imgur.com/WfCg8wY.png)

-<img src="https://i.imgur.com/aEBpwJF.png" style="width:800px">
+## LNbits as an LNURL-withdraw fallback

-## LNbits API
+LNURL has a fallback scheme, so if scanned by a regular QR code reader it can default to a URL. LNbits exploits this to generate an instant wallet using the [LNURL-withdraw](https://github.com/btcontract/lnurl-rfc/blob/master/lnurl-withdraw.md).

-LNbits has a powerful API, many projects use LNbits to do the heavy lifting for their bitcoin/lightning services.
+![lnurl fallback](https://i.imgur.com/CPBKHIv.png)

-<img src="https://i.imgur.com/V742sb9.png" style="width:800px">
+Using **lnbits.com/?lightning="LNURL-withdraw"** will trigger a withdraw that builds an LNbits wallet.
+Example use would be an ATM, which utilizes LNURL, if the user scans the QR with a regular QR code scanner app, they will still be able to access the funds.

-## LNbits node manager
+![lnurl ATM](https://i.imgur.com/Gi6bn3L.jpg)

-LNbits comes packaged with a light node management UI, to make running your node that much easier.
+## LNbits as an instant wallet

-<img src="https://i.imgur.com/TYqIK60.png" style="width:800px">
+Wallets can be easily generated and given out to people at events. "Go to this website", has a lot less friction than "Download this app".

-## LNbits across all your devices
-
-As well as working great in a browser, LNbits has native IoS and Android apps as well as a chrome extension. So you can enjoy the same UI across ALL your devices.
-
-<img src="https://i.imgur.com/J96EbRf.png" style="width:800px">
+![lnurl ATM](https://i.imgur.com/xFWDnwy.png)

 ## Tip us

@@ -1,7 +1,7 @@
 title: "LNbits docs"
 remote_theme: pmarsceill/just-the-docs
 color_scheme: dark
-logo: "/logos/lnbits-full-inverse.png"
+logo: "/logos/lnbits-full--inverse.png"
 search_enabled: true
 url: https://docs.lnbits.org
 aux_links:
@@ -9,4 +9,4 @@ nav_order: 3
 API reference
 =============

-[Swagger Docs](https://legend.lnbits.com/docs)
+[Swagger Docs](https://docs.lnbits.org/devs/swagger.html)
@@ -21,7 +21,7 @@ mv templates/example templates/mysuperplugin # Rename templates folder.
 - if you are on macOS and having difficulty with 'sed', consider `brew install gnu-sed` and use 'gsed', without -0 option after xargs.

 1. Edit `manifest.json` and change the organisation name to your GitHub username.
-1. Push your changes to GitHub.
+1. Push your changes to GitHub. 
 1. In GitHub create a new release for your extension repo. Tag the release with `0.0.1`
 1. Copy the URL of the extension's raw `manifest.json` URL `https://raw.githubusercontent.com/[my-user-name]/mysuperplugin/master/manifest.json`
 1. If you are using the LMNbits Admin UI, go to the Admin UI > Server > Extension Sources, click "Add", paste the URL, then click "Save"
@@ -42,7 +42,7 @@ Extension structure explained
 Adding new dependencies
 -----------------------

-DO NOT ADD NEW DEPENDENCIES. Try to use the dependencies that are available in `pyproject.toml`. Getting the LNbits project to accept a new dependency is time consuming and uncertain, and may result in your extension NOT being made available to others.
+DO NOT ADD NEW DEPENDENCIES. Try to use the dependencies that are availabe in `pyproject.toml`. Getting the LNbits project to accept a new dependency is time consuming and uncertain, and may result in your extension NOT being made available to others.

 If for some reason your extensions must have a new python package to work, and its nees are not met in `pyproject.toml`, you can add a new package using `poerty`:

@@ -51,7 +51,7 @@ $ poetry add <package>
 ```

 **But we need an extra step to make sure LNbits doesn't break in production.**
-Dependencies need to be added to `pyproject.toml`, then tested by running on `poetry` compatibility can be tested with `nix build .#checks.x86_64-linux.vmTest`.
+Dependencies need to be added to `pyproject.toml`, then tested by running on `poetry` compatability can be tested with `nix build .#checks.x86_64-linux.vmTest`.


 SQLite to PostgreSQL migration
@@ -8,7 +8,7 @@ nav_order: 4
 Admin UI
 ========
 The LNbits Admin UI lets you change LNbits settings via the LNbits frontend.
-It is disabled by default and the first time you set the environment variable `LNBITS_ADMIN_UI=true`
+It is disabled by default and the first time you set the environment variable LNBITS_ADMIN_UI=true
 the settings are initialized and saved to the database and will be used from there as long the UI is enabled.
 From there on the settings from the database are used.

@@ -32,18 +32,15 @@ There is also the possibility of posting the super user via webhook to another s

 Admin Users
 ===========
-environment variable: `LNBITS_ADMIN_USERS`, comma-separated list of user ids
-Admin Users can change settings in the admin ui as well, with the exception of funding source settings, because they require e server restart and could potentially make the server inaccessible. Also they have access to all the extension defined in `LNBITS_ADMIN_EXTENSIONS`.
+environment variable: LNBITS_ADMIN_USERS, comma-separated list of user ids
+Admin Users can change settings in the admin ui as well, with the exception of funding source settings, because they require e server restart and could potentially make the server inaccessable. Also they have access to all the extension defined in LNBITS_ADMIN_EXTENSIONS.


 Allowed Users
 =============
-environment variable: `LNBITS_ALLOWED_USERS`, comma-separated list of user ids
+environment variable: LNBITS_ALLOWED_USERS, comma-separated list of user ids
 By defining this users, LNbits will no longer be usable by the public, only defined users and admins can then access the LNbits frontend.

-Setting this environment variable also disables account creation.
-Account creation can be also disabled by setting `LNBITS_ALLOW_NEW_ACCOUNTS=false`
-

 How to activate
 =============
@@ -60,7 +57,7 @@ $ poetry run lnbits
 ```
 You can now `cat` the Super User ID:
 ```
-$ cat data/.super_user
+$ cat .super_user
 123de4bfdddddbbeb48c8bc8382fe123
 ```
 You can access your super user account at `/wallet?usr=super_user_id`. You just have to append it to your normal LNbits web domain.
@@ -34,7 +34,7 @@ allow-self-payment=1

 <details><summary>Which funding sources can I use for LNbits?</summary>
  <p>There are several ways to run a LNbits instance funded from different sources. It is important to choose a source that has a good liquidity and good peers connected. If you use LNbits for public services your users´ payments can then flow happily in both directions. If you would like to fund your LNbits wallet via btc please see section Troubleshooting.</p>
-  <p>The <a href="https://docs.lnbits.org/guide/wallets.html">LNbits manual</a> shows you which sources can be used and how to configure each.</p>
+  <p>The <a href="http://docs.lnbits.org/guide/wallets.html">LNbits manual</a> shows you which sources can be used and how to configure each: CLN, LND, LNPay, Cliche, OpenNode as well as bots.</p>
 </details>

 <!--Later to be added
@@ -47,7 +47,7 @@ allow-self-payment=1
  <p>When you run your LNbits in clearnet basically everyone can generate a wallet on it. Since the funds of your node are bound to these wallets you might want to prevent that. There are two ways to do so:</p>
  <ul>
   <li>Configure allowed users & extensions <a href="https://github.com/lnbits/lnbits/blob/main/.env.example">in the .env file</a></li>
-   <li>Configure allowed users & extensions <a href="https://github.com/lnbits/usermanager">via the Usermanager-Extension</a>. You can find <a href="https://docs.lnbits.org/guide/admin_ui.html">more info about the superuser and the admin extension here</a></li>
+   <li>Configure allowed users & extensions <a href="https://github.com/lnbits/usermanager">via the Usermanager-Extension</a>. You can find <a href="http://docs.lnbits.org/guide/admin_ui.html">more info about the superuser and the admin extension here</a></li>
  </ul>
  <p>Please note that all entries in the .env file will not be the taken into account once you activated the admin extension.</p>
 </details>
@@ -100,7 +100,7 @@ allow-self-payment=1

 <details><summary>Configure a comment that people see when paying to my LNURLp QR</summary>
  <p>When you create a LNURL-p, by default the comment box is not filled. That means comments are not allowed to be attached to payments.<p>
-  <p>In order to allow comments, add the characters length of the box, from 1 to 250. Once you put a number there,
+  <p>In order to allow comments, add the characters lenght of the box, from 1 to 250. Once you put a number there,
     the comment box will be displayed in the payment process. You can also edit a LNURL-p already created and add that number.</p>

 ![lnbits-lnurl-comment.png](https://i.postimg.cc/HkJQ9xKr/lnbits-lnurl-comment.png)
@@ -150,7 +150,7 @@ allow-self-payment=1
 </details>

  <details><summary>Can I configure a name to the payments i make?</summary>
-  <p>In LNbits this is currently not possible to do - but to receive. This is only possible if the sender's LN wallet supports <a href="https://github.com/lnurl/luds">LUD-18</a> (nameDesc) like e.g. <a href="https://darthcoin.substack.com/p/obw-open-bitcoin-wallet">Open Bitcoin Wallet - OBW</a> does. You will then see an alias/pseudonym in the details section of your LNbits transactions (click the arrows). Note that you can give any name there and it might not be related to the real sender´s name(!) if your receive such.</p>
+  <p>In LNbits this is currently not possible to do - but to receive. This is only possible if the sender's LN wallet supports <a href="https://github.com/lnurl/luds">LUD-18</a> (nameDesc) like e.g. <a href="https://darthcoin.substack.com/p/obw-open-bitcoin-wallet">Open Bitcion Wallet - OBW</a> does. You will then see an alias/pseudonym in the details section of your LNbits transactions (click the arrows). Note that you can give any name there and it might not be related to the real sender´s name(!) if your receive such.</p>
 ![lnbits-tx-details.png](https://i.postimg.cc/yYnvyK4w/lnbits-tx-details.png)
  </p>
  </details>
@@ -263,6 +263,6 @@ allow-self-payment=1

 ## Developing for LNbits
 <ul>
-    <li><a href="https://docs.lnbits.org/devs/development.html">Making extensions / How to use Websockets / API reference</a></li>
+    <li><a href="http://docs.lnbits.org/devs/development.html">Making Estension / how to use Websockets / API reference</a></li>
    <li><a href="https://t.me/lnbits">Telegram LNbits Support Group</a></li></ul>
 </ul>
@@ -13,29 +13,20 @@ By default, LNbits will use SQLite as its database. You can also use PostgreSQL
 ## Option 1 (recommended): poetry

 Mininum poetry version has is ^1.2, but it is recommended to use latest poetry. (including OSX)
-Make sure you have Python 3.9 or 3.10 installed.

-### install python on ubuntu
 ```sh
+git clone https://github.com/lnbits/lnbits.git
+cd lnbits
+
 # for making sure python 3.9 is installed, skip if installed. To check your installed version: python3 --version
 sudo apt update
 sudo apt install software-properties-common
 sudo add-apt-repository ppa:deadsnakes/ppa
 sudo apt install python3.9 python3.9-distutils
-```

-### install poetry
-```sh
 curl -sSL https://install.python-poetry.org | python3 -
 # Once the above poetry install is completed, use the installation path printed to terminal and replace in the following command
 export PATH="/home/user/.local/bin:$PATH"
-```
-
-```sh
-git clone https://github.com/lnbits/lnbits.git
-cd lnbits
-git checkout main
-
 # Next command, you can exchange with python3.10 or newer versions.
 # Identify your version with python3 --version and specify in the next line
 # command is only needed when your default python is not ^3.9 or ^3.10
@@ -69,59 +60,44 @@ poetry install --only main

 ## Option 2: Nix

+> note: currently not supported while we make some architectural changes on the path to leave beta
+
 ```sh
-# Install nix. If you have installed via another manager, remove and use this install (from https://nixos.org/download)
-sh <(curl -L https://nixos.org/nix/install) --daemon
-
-# Enable nix-command and flakes experimental features for nix:
-echo 'experimental-features = nix-command flakes' >> /etc/nix/nix.conf
-
-# Add cachix for cached binaries
-nix-env -iA cachix -f https://cachix.org/api/v1/install
-cachix use lnbits
-
-# Clone and build LNbits
 git clone https://github.com/lnbits/lnbits.git
 cd lnbits
-nix build
+# Modern debian distros usually include Nix, however you can install with:
+# 'sh <(curl -L https://nixos.org/nix/install) --daemon', or use setup here https://nixos.org/download.html#nix-verify-installation

+nix build .#lnbits
 mkdir data
+
 ```

 #### Running the server

 ```sh
-nix run
+# .env variables are currently passed when running
+LNBITS_DATA_FOLDER=data LNBITS_BACKEND_WALLET_CLASS=LNbitsWallet LNBITS_ENDPOINT=https://legend.lnbits.com LNBITS_KEY=7b1a78d6c78f48b09a202f2dcb2d22eb ./result/bin/lnbits --port 9000
 ```

-Ideally you would set the environment via the `.env` file,
-but you can also set the env variables or pass command line arguments:
-
-``` sh
-# .env variables are currently passed when running, but LNbits can be managed with the admin UI.
-LNBITS_ADMIN_UI=true ./result/bin/lnbits --port 9000
-
-# Once you have created a user, you can set as the super_user
-SUPER_USER=be54db7f245346c8833eaa430e1e0405 LNBITS_ADMIN_UI=true ./result/bin/lnbits --port 9000
-```

 ## Option 3: Docker

 use latest version from docker hub
 ```sh
-docker pull lnbits/lnbits
+docker pull lnbitsdocker/lnbits-legend
 wget https://raw.githubusercontent.com/lnbits/lnbits/main/.env.example -O .env
 mkdir data
-docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbits/lnbits
+docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbitsdocker/lnbits-legend
 ```
 build the image yourself
 ```sh
 git clone https://github.com/lnbits/lnbits.git
 cd lnbits
-docker build -t lnbits/lnbits .
+docker build -t lnbitsdocker/lnbits-legend .
 cp .env.example .env
 mkdir data
-docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbits/lnbits
+docker run --detach --publish 5000:5000 --name lnbits --volume ${PWD}/.env:/app/.env --volume ${PWD}/data/:/app/data lnbitsdocker/lnbits-legend
 ```

 ## Option 4: Fly.io
@@ -8,7 +8,7 @@ nav_order: 3
 Backend wallets
 ===============

-LNbits can run on top of many Lightning Network funding sources with more being added regularly.
+LNbits can run on top of many lightning-network funding sources. Currently there is support for CoreLightning, LND, LNbits, LNPay and OpenNode, with more being added regularly.

 A backend wallet can be configured using the following LNbits environment variables:

@@ -19,7 +19,6 @@ A backend wallet can be configured using the following LNbits environment variab
 - `CORELIGHTNING_RPC`: /file/path/lightning-rpc

 ### CoreLightning REST
-
 - `LNBITS_BACKEND_WALLET_CLASS`: **CoreLightningRestWallet**
 - `CORELIGHTNING_REST_URL`: http://127.0.0.1:8185/
 - `CORELIGHTNING_REST_MACAROON`: /file/path/admin.macaroon or Base64/Hex
@@ -71,6 +70,7 @@ For the invoice listener to work you have a publicly accessible URL in your LNbi
 - `LNPAY_API_KEY`: sak_apiKey
 - `LNPAY_WALLET_KEY`: waka_apiKey

+
 ### OpenNode

 For the invoice to work you must have a publicly accessible URL in your LNbits. No manual webhook setting is necessary.
@@ -79,21 +79,6 @@ For the invoice to work you must have a publicly accessible URL in your LNbits.
 - `OPENNODE_API_ENDPOINT`: https://api.opennode.com/
 - `OPENNODE_KEY`: opennodeAdminApiKey

-### Alby
-
-For the invoice to work you must have a publicly accessible URL in your LNbits. No manual webhook setting is necessary. You can generate an alby access token here: https://getalby.com/developer/access_tokens/new
-
- `LNBITS_BACKEND_WALLET_CLASS`: **AlbyWallet**
- `ALBY_API_ENDPOINT`: https://api.getalby.com/
- `ALBY_ACCESS_TOKEN`: AlbyAccessToken
-
-### ZBD
-
-For the invoice to work you must have a publicly accessible URL in your LNbits. No manual webhook setting is necessary. You can generate an ZBD API Key here: https://zbd.dev/docs/dashboard/projects/api
-
- `LNBITS_BACKEND_WALLET_CLASS`: **ZBDWallet**
- `ZBD_API_ENDPOINT`: https://api.zebedee.io/v0/
- `ZBD_API_KEY`: ZBDApiKey

 ### Cliche Wallet

@@ -5,13 +5,13 @@ nav_order: 1
 ---


-LNbits, free and open-source Lightning Network wallet/accounts system
+LNbits, free and open-source lightning-network wallet/accounts system
 =====================================================================

 LNbits is a very simple Python application that sits on top of any funding source, and can be used as:

 * Accounts system to mitigate the risk of exposing applications to your full balance, via unique API keys for each wallet
-* Extendable platform for exploring Lightning Network functionality via LNbits extension framework
+* Extendable platform for exploring lightning-network functionality via LNbits extension framework
 * Part of a development stack via LNbits API
 * Fallback wallet for the LNURL scheme
 * Instant wallet for LN demonstrations
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 101.041 30.0001"><defs><path id="a" d="M33.2619 148.1667h154.2143v68.7917H33.2619z"/></defs><g fill="#1f2234" aria-label="LNbits" font-family="sans-serif" font-size=".3095" font-weight="400" letter-spacing=".0031" style="line-height:1.25;white-space:pre;shape-inside:url(#a)" transform="matrix(72.4607 0 0 72.4607 -2399.2814 -10741.3589)"><g transform="matrix(.00244 0 0 .00244 33.0708 148.1594)"><circle cx="101.2976" cy="116.4167" r="84.6667" fill="#673ab7" fill-rule="evenodd"/><path fill="#eee" d="M79.1105 71.9667v49.0613h13.3803v40.141l31.2208-53.5213h-17.8404l17.8404-35.681z"/></g><g fill="#eee" font-family="roboto"><path d="M33.6755 148.518h.0962v.0364h-.1416v-.22h.0454zM33.9796 148.5544h-.0453l-.0883-.1448v.1448h-.0453v-.22h.0453l.0884.145v-.145h.0452z" font-weight="700" style="-inkscape-font-specification:'roboto Bold'"/><path d="M34.1625 148.4744q0 .0375-.0172.0603-.0172.0227-.0462.0227-.031 0-.048-.0219l-.0014.019h-.0256v-.2322h.028v.0866q.0168-.021.0466-.021.0298 0 .0467.0225.017.0225.017.0617zm-.028-.003q0-.0286-.011-.044-.011-.0157-.0317-.0157-.0277 0-.0398.0257v.0707q.0129.0257.04.0257.0202 0 .0314-.0156.0112-.0156.0112-.0469zM34.231 148.5544h-.028v-.1635h.028zm-.0302-.2069q0-.007.0041-.0115.0042-.005.0124-.005.0082 0 .0124.005.0042.005.0042.0115 0 .007-.0042.0113-.0042.005-.0124.005-.0082 0-.0124-.005-.004-.005-.004-.0113zM34.3167 148.3513v.0396h.0305v.0216h-.0305v.1014q0 .01.004.0148.0042.005.014.005.0048 0 .0133-.002v.0227q-.011.003-.0215.003-.0187 0-.0283-.0113-.0095-.0113-.0095-.0322v-.1014h-.0297v-.0216h.0297v-.0396zM34.478 148.511q0-.0113-.0086-.0175-.0085-.006-.0298-.0109-.0211-.005-.0337-.0109-.0124-.006-.0184-.015t-.006-.0209q0-.02.017-.034.017-.0139.0435-.0139.0278 0 .045.0144.0174.0144.0174.0367h-.028q0-.0115-.0099-.0198-.0097-.008-.0245-.008-.0152 0-.0238.007-.0086.007-.0086.0174 0 .0101.008.0153.008.005.0288.01.021.005.034.0112.013.007.0192.0157.0063.009.0063.0222 0 .022-.0175.0352-.0175.0131-.0455.0131-.0197 0-.0348-.007-.015-.007-.0237-.0193-.0085-.0125-.0085-.027h.028q.0007.014.0111.0223.0106.008.0279.008.0158 0 .0253-.006.0097-.006.0097-.0172z" style="-inkscape-font-specification:roboto"/></g></g></svg>
@@ -1,4 +1,19 @@
 <svg width="900" height="900" viewBox="0 0 900 900" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_i_10_29)">
 <circle cx="450" cy="450" r="450" fill="#1E1E1E"/>
+</g>
 <path d="M387.802 476.423L281.613 730.887L584.54 389.763H459.418L619.113 168.387H407.558L305.485 476.423H387.802Z" fill="#FF1FE1"/>
+<defs>
+<filter id="filter0_i_10_29" x="-0.1" y="-0.1" width="900.1" height="900.1" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feMorphology radius="0.6" operator="dilate" in="SourceAlpha" result="effect1_innerShadow_10_29"/>
+<feOffset dx="-1" dy="-0.4"/>
+<feGaussianBlur stdDeviation="0.35"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.121569 0 0 0 0 0.882353 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_10_29"/>
+</filter>
+</defs>
 </svg>
@@ -5,11 +5,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
        "type": "github"
      },
      "original": {
@@ -26,11 +26,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1698974481,
-        "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=",
+        "lastModified": 1688870561,
+        "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=",
        "owner": "nix-community",
        "repo": "nix-github-actions",
-        "rev": "4bb5e752616262457bc7ca5882192a564c0472d2",
+        "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301",
        "type": "github"
      },
      "original": {
@@ -41,16 +41,16 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1702233072,
-        "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=",
+        "lastModified": 1678470307,
+        "narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348",
+        "rev": "0c4800d579af4ed98ecc47d464a5e7b0870c4b1f",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -61,16 +61,14 @@
        "nix-github-actions": "nix-github-actions",
        "nixpkgs": [
          "nixpkgs"
-        ],
-        "systems": "systems_2",
-        "treefmt-nix": "treefmt-nix"
+        ]
      },
      "locked": {
-        "lastModified": 1702334837,
-        "narHash": "sha256-QZG6+zFshyY+L8m2tlOTm75U5m9y7z01g0josVK+8Os=",
+        "lastModified": 1695386222,
+        "narHash": "sha256-5lgnhCCGW0NH5+m5iTED8u6NSSM/dbH9LBPvX0x0XXg=",
        "owner": "nix-community",
        "repo": "poetry2nix",
-        "rev": "1f4bcbf1be73abc232a972a77102a3e820485a99",
+        "rev": "093383b3d7fdd36846a7d84e128ca11865800538",
        "type": "github"
      },
      "original": {
@@ -99,41 +97,6 @@
        "repo": "default",
        "type": "github"
      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "id": "systems",
-        "type": "indirect"
-      }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "poetry2nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1699786194,
-        "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
    }
  },
  "root": "root",
@@ -2,7 +2,7 @@
  description = "LNbits, free and open-source Lightning wallet and accounts system";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
    poetry2nix = {
      url = "github:nix-community/poetry2nix";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -13,11 +13,19 @@
      supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
      forSystems = systems: f:
        nixpkgs.lib.genAttrs systems
-        (system: f system (import nixpkgs { inherit system; overlays = [ poetry2nix.overlays.default self.overlays.default ]; }));
+        (system: f system (import nixpkgs { inherit system; overlays = [ poetry2nix.overlay self.overlays.default ]; }));
      forAllSystems = forSystems supportedSystems;
      projectName = "lnbits";
    in
    {
+      devShells = forAllSystems (system: pkgs: {
+        default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            nodePackages.prettier
+            poetry
+          ];
+        };
+      });
      overlays = {
        default = final: prev: {
          ${projectName} = self.packages.${prev.stdenv.hostPlatform.system}.${projectName};
@@ -28,18 +36,20 @@
        ${projectName} = pkgs.poetry2nix.mkPoetryApplication {
          projectDir = ./.;
          meta.rev = self.dirtyRev or self.rev;
-          meta.mainProgram = projectName;
          overrides = pkgs.poetry2nix.overrides.withDefaults (final: prev: {
-            protobuf = prev.protobuf.override { preferWheel = true; };
            ruff = prev.ruff.override { preferWheel = true; };
-            wallycore = prev.wallycore.override { preferWheel = true; };
-            # remove the following override when https://github.com/nix-community/poetry2nix/pull/1563 is merged
-            asgi-lifespan = prev.asgi-lifespan.overridePythonAttrs (
-              old: { buildInputs = (old.buildInputs or []) ++ [ prev.setuptools ]; }
-            );
-            pytest-md = prev.pytest-md.overridePythonAttrs (
-              old: { buildInputs = (old.buildInputs or []) ++ [ prev.setuptools ]; }
-            );
+            fastapi = prev.fastapi.overridePythonAttrs (old: {
+              postPatch = ''
+                substituteInPlace pyproject.toml \
+                  --replace '"Framework :: Pydantic",' "" \
+                  --replace '"Framework :: Pydantic :: 1",' ""
+              '';
+            });
+            bolt11 = prev.bolt11.overrideAttrs (old: {
+              nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
+                prev.poetry
+              ];
+            });
          });
        };
      });
@@ -4,59 +4,47 @@ import importlib
 import logging
 import os
 import shutil
+import signal
 import sys
 import traceback
-from contextlib import asynccontextmanager
 from hashlib import sha256
 from http import HTTPStatus
 from pathlib import Path
-from typing import Callable, List, Optional
+from typing import Callable, List

 from fastapi import FastAPI, HTTPException, Request
 from fastapi.exceptions import RequestValidationError
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import RedirectResponse
 from fastapi.staticfiles import StaticFiles
 from loguru import logger
 from slowapi import Limiter
 from slowapi.util import get_remote_address
-from starlette.middleware.sessions import SessionMiddleware
 from starlette.responses import JSONResponse

-from lnbits.core.crud import get_dbversions, get_installed_extensions
+from lnbits.core.crud import get_installed_extensions
 from lnbits.core.helpers import migrate_extension_database
 from lnbits.core.services import websocketUpdater
-from lnbits.core.tasks import (  # watchdog_task
-    killswitch_task,
-    wait_for_paid_invoices,
+from lnbits.core.tasks import (  # register_watchdog,; unregister_watchdog,
+    register_killswitch,
+    register_task_listeners,
 )
 from lnbits.settings import settings
-from lnbits.tasks import (
-    cancel_all_tasks,
-    create_permanent_task,
-    register_invoice_listener,
-)
+from lnbits.tasks import cancel_all_tasks, create_permanent_task
 from lnbits.utils.cache import cache
 from lnbits.wallets import get_wallet_class, set_wallet_class

-from .commands import migrate_databases
+from .commands import db_versions, load_disabled_extension_list, migrate_databases
 from .core import init_core_routers
 from .core.db import core_app_extra
 from .core.services import check_admin_settings, check_webpush_settings
-from .core.views.extension_api import add_installed_extension
+from .core.views.api import add_installed_extension
 from .core.views.generic import update_installed_extension_state
-from .extension_manager import (
-    Extension,
-    InstallableExtension,
-    get_valid_extensions,
-    version_parse,
-)
+from .extension_manager import Extension, InstallableExtension, get_valid_extensions
 from .helpers import template_renderer
 from .middleware import (
    CustomGZipMiddleware,
    ExtensionsRedirectMiddleware,
    InstalledExtensionMiddleware,
-    add_first_install_middleware,
    add_ip_block_middleware,
    add_ratelimit_middleware,
 )
@@ -65,62 +53,10 @@ from .tasks import (
    check_pending_payments,
    internal_invoice_listener,
    invoice_listener,
+    webhook_handler,
 )


-async def startup(app: FastAPI):
-
-    # wait till migration is done
-    await migrate_databases()
-
-    # setup admin settings
-    await check_admin_settings()
-    await check_webpush_settings()
-
-    log_server_info()
-
-    # initialize WALLET
-    try:
-        set_wallet_class()
-    except Exception as e:
-        logger.error(f"Error initializing {settings.lnbits_backend_wallet_class}: {e}")
-        set_void_wallet_class()
-
-    # initialize funding source
-    await check_funding_source()
-
-    # register core routes
-    init_core_routers(app)
-
-    # check extensions after restart
-    if not settings.lnbits_extensions_deactivate_all:
-        await check_installed_extensions(app)
-        register_all_ext_routes(app)
-
-    if settings.lnbits_admin_ui:
-        initialize_server_logger()
-
-    # initialize tasks
-    register_async_tasks()
-
-
-async def shutdown():
-    # shutdown event
-    cancel_all_tasks()
-
-    # wait a bit to allow them to finish, so that cleanup can run without problems
-    await asyncio.sleep(0.1)
-    WALLET = get_wallet_class()
-    await WALLET.cleanup()
-
-
-@asynccontextmanager
-async def lifespan(app: FastAPI):
-    await startup(app)
-    yield
-    await shutdown()
-
-
 def create_app() -> FastAPI:
    configure_logger()
    app = FastAPI(
@@ -130,7 +66,6 @@ def create_app() -> FastAPI:
            "accounts system with plugins."
        ),
        version=settings.version,
-        lifespan=lifespan,
        license_info={
            "name": "MIT License",
            "url": "https://raw.githubusercontent.com/lnbits/lnbits/main/LICENSE",
@@ -141,10 +76,12 @@ def create_app() -> FastAPI:
    setattr(core_app_extra, "register_new_ext_routes", register_new_ext_routes(app))
    setattr(core_app_extra, "register_new_ratelimiter", register_new_ratelimiter(app))

-    # register static files
-    static_path = Path("lnbits", "static")
-    static = StaticFiles(directory=static_path)
-    app.mount("/static", static, name="static")
+    app.mount("/static", StaticFiles(packages=[("lnbits", "static")]), name="static")
+    app.mount(
+        "/core/static",
+        StaticFiles(packages=[("lnbits.core", "static")]),
+        name="core_static",
+    )

    g().base_url = f"http://{settings.host}:{settings.port}"

@@ -156,45 +93,52 @@ def create_app() -> FastAPI:
        CustomGZipMiddleware, minimum_size=1000, exclude_paths=["/api/v1/payments/sse"]
    )

-    # required for SSO login
-    app.add_middleware(SessionMiddleware, secret_key=settings.auth_secret_key)
-
    # order of these two middlewares is important
    app.add_middleware(InstalledExtensionMiddleware)
    app.add_middleware(ExtensionsRedirectMiddleware)

    register_custom_extensions_path()

-    add_first_install_middleware(app)
-
    # adds security middleware
    add_ip_block_middleware(app)
    add_ratelimit_middleware(app)

+    register_startup(app)
+    register_routes(app)
+    register_async_tasks(app)
    register_exception_handlers(app)
+    register_shutdown(app)

    return app


 async def check_funding_source() -> None:
+    original_sigint_handler = signal.getsignal(signal.SIGINT)
+
+    def signal_handler(signal, frame):
+        logger.debug(
+            f"SIGINT received, terminating LNbits. signal: {signal}, frame: {frame}"
+        )
+        sys.exit(1)
+
+    signal.signal(signal.SIGINT, signal_handler)

    WALLET = get_wallet_class()

+    # fallback to void after 30 seconds of failures
    sleep_time = 5
-    max_retries = 5
+    timeout = int(30 / sleep_time)
+
+    balance = 0
    retry_counter = 0

    while True:
        try:
-            logger.info(f"Connecting to backend {WALLET.__class__.__name__}...")
            error_message, balance = await WALLET.status()
            if not error_message:
                retry_counter = 0
-                logger.success(
-                    f"✔️ Backend {WALLET.__class__.__name__} connected "
-                    f"and with a balance of {balance} msat."
-                )
                break
+
            logger.error(
                f"The backend for {WALLET.__class__.__name__} isn't "
                f"working properly: '{error_message}'",
@@ -202,18 +146,23 @@ async def check_funding_source() -> None:
            )
        except Exception as e:
            logger.error(f"Error connecting to {WALLET.__class__.__name__}: {e}")
+            pass

-        if retry_counter == max_retries:
+        if settings.lnbits_admin_ui and retry_counter == timeout:
            set_void_wallet_class()
            WALLET = get_wallet_class()
            break
+        else:
+            logger.warning(f"Retrying connection to backend in {sleep_time} seconds...")
+            retry_counter += 1
+            await asyncio.sleep(sleep_time)

-        retry_counter += 1
-        logger.warning(
-            f"Retrying connection to backend in {sleep_time} seconds... "
-            f"({retry_counter}/{max_retries})"
-        )
-        await asyncio.sleep(sleep_time)
+    signal.signal(signal.SIGINT, original_sigint_handler)
+
+    logger.info(
+        f"✔️ Backend {WALLET.__class__.__name__} connected "
+        f"and with a balance of {balance} msat."
+    )


 def set_void_wallet_class():
@@ -232,11 +181,12 @@ async def check_installed_extensions(app: FastAPI):
    persist state. Zips that are missing will be re-downloaded.
    """
    shutil.rmtree(os.path.join("lnbits", "upgrades"), True)
-    installed_extensions = await build_all_installed_extensions_list(False)
+    await load_disabled_extension_list()
+    installed_extensions = await build_all_installed_extensions_list()

    for ext in installed_extensions:
        try:
-            installed = await check_installed_extension_files(ext)
+            installed = check_installed_extension_files(ext)
            if not installed:
                await restore_installed_extension(app, ext)
                logger.info(
@@ -254,9 +204,7 @@ async def check_installed_extensions(app: FastAPI):
        logger.info(f"{ext.id} ({ext.installed_version})")


-async def build_all_installed_extensions_list(
-    include_deactivated: Optional[bool] = True,
-) -> List[InstallableExtension]:
+async def build_all_installed_extensions_list() -> List[InstallableExtension]:
    """
    Returns a list of all the installed extensions plus the extensions that
    MUST be installed by default (see LNBITS_EXTENSIONS_DEFAULT_INSTALL).
@@ -269,11 +217,7 @@ async def build_all_installed_extensions_list(
            continue

        ext_releases = await InstallableExtension.get_extension_releases(ext_id)
-        ext_releases = sorted(
-            ext_releases, key=lambda r: version_parse(r.version), reverse=True
-        )
-
-        release = next((e for e in ext_releases if e.is_version_compatible), None)
+        release = ext_releases[0] if len(ext_releases) else None

        if release:
            ext_info = InstallableExtension(
@@ -281,27 +225,17 @@ async def build_all_installed_extensions_list(
            )
            installed_extensions.append(ext_info)

-    if include_deactivated:
-        return installed_extensions
-
-    if settings.lnbits_extensions_deactivate_all:
-        return []
-
-    return [
-        e
-        for e in installed_extensions
-        if e.id not in settings.lnbits_deactivated_extensions
-    ]
+    return installed_extensions


-async def check_installed_extension_files(ext: InstallableExtension) -> bool:
+def check_installed_extension_files(ext: InstallableExtension) -> bool:
    if ext.has_installed_version:
        return True

    zip_files = glob.glob(os.path.join(settings.lnbits_data_folder, "zips", "*.zip"))

    if f"./{str(ext.zip_path)}" not in zip_files:
-        await ext.download_archive()
+        ext.download_archive()
    ext.extract_archive()

    return False
@@ -314,13 +248,24 @@ async def restore_installed_extension(app: FastAPI, ext: InstallableExtension):
    extension = Extension.from_installable_ext(ext)
    register_ext_routes(app, extension)

-    current_version = (await get_dbversions()).get(ext.id, 0)
+    current_version = (await db_versions()).get(ext.id, 0)
    await migrate_extension_database(extension, current_version)

    # mount routes for the new version
    core_app_extra.register_new_ext_routes(extension)
    if extension.upgrade_hash:
-        ext.notify_upgrade()
+        ext.nofiy_upgrade()
+
+
+def register_routes(app: FastAPI) -> None:
+    """Register FastAPI routes / LNbits extensions."""
+    init_core_routers(app)
+
+    for ext in get_valid_extensions():
+        try:
+            register_ext_routes(app, ext)
+        except Exception as e:
+            logger.error(f"Could not load extension `{ext.code}`: {str(e)}")


 def register_custom_extensions_path():
@@ -398,12 +343,51 @@ def register_ext_routes(app: FastAPI, ext: Extension) -> None:
    app.include_router(router=ext_route, prefix=prefix)


-def register_all_ext_routes(app: FastAPI):
-    for ext in get_valid_extensions(False):
+def register_startup(app: FastAPI):
+    @app.on_event("startup")
+    async def lnbits_startup():
        try:
-            register_ext_routes(app, ext)
+            # wait till migration is done
+            await migrate_databases()
+
+            # setup admin settings
+            await check_admin_settings()
+            await check_webpush_settings()
+
+            log_server_info()
+
+            # initialize WALLET
+            try:
+                set_wallet_class()
+            except Exception as e:
+                logger.error(
+                    f"Error initializing {settings.lnbits_backend_wallet_class}: "
+                    f"{str(e)}"
+                )
+                set_void_wallet_class()
+
+            # initialize funding source
+            await check_funding_source()
+
+            # check extensions after restart
+            await check_installed_extensions(app)
+
+            if settings.lnbits_admin_ui:
+                initialize_server_logger()
+
        except Exception as e:
-            logger.error(f"Could not load extension `{ext.code}`: {str(e)}")
+            logger.error(str(e))
+            raise ImportError("Failed to run 'startup' event.")
+
+
+def register_shutdown(app: FastAPI):
+    @app.on_event("shutdown")
+    async def on_shutdown():
+        cancel_all_tasks()
+        # wait a bit to allow them to finish, so that cleanup can run without problems
+        await asyncio.sleep(0.1)
+        WALLET = get_wallet_class()
+        await WALLET.cleanup()


 def initialize_server_logger():
@@ -436,8 +420,6 @@ def log_server_info():
    logger.info(f"Data folder: {settings.lnbits_data_folder}")
    logger.info(f"Database: {get_db_vendor_name()}")
    logger.info(f"Service fee: {settings.lnbits_service_fee}")
-    logger.info(f"Service fee max: {settings.lnbits_service_fee_max}")
-    logger.info(f"Service fee wallet: {settings.lnbits_service_fee_wallet}")


 def get_db_vendor_name():
@@ -453,20 +435,20 @@ def get_db_vendor_name():
    )


-def register_async_tasks():
-    create_permanent_task(check_pending_payments)
-    create_permanent_task(invoice_listener)
-    create_permanent_task(internal_invoice_listener)
-    create_permanent_task(cache.invalidate_forever)
+def register_async_tasks(app):
+    @app.route("/wallet/webhook")
+    async def webhook_listener():
+        return await webhook_handler()

-    # core invoice listener
-    invoice_queue = asyncio.Queue(5)
-    register_invoice_listener(invoice_queue, "core")
-    create_permanent_task(lambda: wait_for_paid_invoices(invoice_queue))
-
-    # TODO: implement watchdog properly
-    # create_permanent_task(watchdog_task)
-    create_permanent_task(killswitch_task)
+    @app.on_event("startup")
+    async def listeners():
+        create_permanent_task(check_pending_payments)
+        create_permanent_task(invoice_listener)
+        create_permanent_task(internal_invoice_listener)
+        create_permanent_task(cache.invalidate_forever)
+        register_task_listeners()
+        register_killswitch()
+        # await run_deferred_async() # calle: doesn't do anyting?


 def register_exception_handlers(app: FastAPI):
@@ -483,7 +465,7 @@ def register_exception_handlers(app: FastAPI):
            and "text/html" in request.headers["accept"]
        ):
            return template_renderer().TemplateResponse(
-                request, "error.html", {"err": f"Error: {str(exc)}"}
+                "error.html", {"request": request, "err": f"Error: {str(exc)}"}
            )

        return JSONResponse(
@@ -505,9 +487,8 @@ def register_exception_handlers(app: FastAPI):
            and "text/html" in request.headers["accept"]
        ):
            return template_renderer().TemplateResponse(
-                request,
                "error.html",
-                {"err": f"Error: {str(exc)}"},
+                {"request": request, "err": f"Error: {str(exc)}"},
            )

        return JSONResponse(
@@ -526,15 +507,7 @@ def register_exception_handlers(app: FastAPI):
            and "accept" in request.headers
            and "text/html" in request.headers["accept"]
        ):
-            if exc.headers and "token-expired" in exc.headers:
-                response = RedirectResponse("/")
-                response.delete_cookie("cookie_access_token")
-                response.delete_cookie("is_lnbits_user_authorized")
-                response.set_cookie("is_access_token_expired", "true")
-                return response
-
            return template_renderer().TemplateResponse(
-                request,
                "error.html",
                {
                    "request": request,
@@ -553,34 +526,11 @@ def configure_logger() -> None:
    log_level: str = "DEBUG" if settings.debug else "INFO"
    formatter = Formatter()
    logger.add(sys.stdout, level=log_level, format=formatter.format)
-
-    if settings.enable_log_to_file:
-        logger.add(
-            Path(settings.lnbits_data_folder, "logs", "lnbits.log"),
-            rotation=settings.log_rotation,
-            retention=settings.log_retention,
-            level="INFO",
-            format=formatter.format,
-        )
-        logger.add(
-            Path(settings.lnbits_data_folder, "logs", "debug.log"),
-            rotation=settings.log_rotation,
-            retention=settings.log_retention,
-            level="DEBUG",
-            format=formatter.format,
-        )
-
    logging.getLogger("uvicorn").handlers = [InterceptHandler()]
    logging.getLogger("uvicorn.access").handlers = [InterceptHandler()]
    logging.getLogger("uvicorn.error").handlers = [InterceptHandler()]
    logging.getLogger("uvicorn.error").propagate = False

-    logging.getLogger("sqlalchemy").handlers = [InterceptHandler()]
-    logging.getLogger("sqlalchemy.engine.base").handlers = [InterceptHandler()]
-    logging.getLogger("sqlalchemy.engine.base").propagate = False
-    logging.getLogger("sqlalchemy.engine.base.Engine").handlers = [InterceptHandler()]
-    logging.getLogger("sqlalchemy.engine.base.Engine").propagate = False
-

 class Formatter:
    def __init__(self):
@@ -1,57 +1,17 @@
 import asyncio
-import importlib
-import time
-from functools import wraps
 from pathlib import Path
-from typing import List, Optional, Tuple
-from urllib.parse import urlparse

 import click
-import httpx
-from fastapi.exceptions import HTTPException
 from loguru import logger
-from packaging import version

-from lnbits.core.models import Payment, User
-from lnbits.core.services import check_admin_settings
-from lnbits.core.views.extension_api import (
-    api_install_extension,
-    api_uninstall_extension,
-)
 from lnbits.settings import settings
-from lnbits.wallets.base import Wallet

 from .core import db as core_db
 from .core import migrations as core_migrations
-from .core.crud import (
-    delete_accounts_no_wallets,
-    delete_unused_wallets,
-    delete_wallet_by_id,
-    delete_wallet_payment,
-    get_dbversions,
-    get_inactive_extensions,
-    get_installed_extension,
-    get_installed_extensions,
-    get_payments,
-    remove_deleted_wallets,
-    update_payment_status,
-)
+from .core.crud import get_dbversions, get_inactive_extensions
 from .core.helpers import migrate_extension_database, run_migration
 from .db import COCKROACH, POSTGRES, SQLITE
-from .extension_manager import (
-    CreateExtension,
-    ExtensionRelease,
-    InstallableExtension,
-    get_valid_extensions,
-)
-
-
-def coro(f):
-    @wraps(f)
-    def wrapper(*args, **kwargs):
-        return asyncio.run(f(*args, **kwargs))
-
-    return wrapper
+from .extension_manager import get_valid_extensions


@click.group()
@@ -68,52 +28,34 @@ def db():
    """


-@lnbits_cli.group()
-def extensions():
-    """
-    Extensions related commands
-    """
-
-
-def get_super_user() -> Optional[str]:
+def get_super_user() -> str:
    """Get the superuser"""
-    superuser_file = Path(settings.lnbits_data_folder, ".super_user")
-    if not superuser_file.exists() or not superuser_file.is_file():
-        raise ValueError(
-            "Superuser id not found. Please check that the file "
-            + f"'{superuser_file.absolute()}' exists and has read permissions."
-        )
-    with open(superuser_file, "r") as file:
+    with open(Path(settings.lnbits_data_folder) / ".super_user", "r") as file:
        return file.readline()


@lnbits_cli.command("superuser")
 def superuser():
    """Prints the superuser"""
-    try:
-        click.echo(get_super_user())
-    except ValueError as e:
-        click.echo(str(e))
+    click.echo(get_super_user())


@lnbits_cli.command("superuser-url")
 def superuser_url():
    """Prints the superuser"""
-    try:
-        click.echo(
-            f"http://{settings.host}:{settings.port}/wallet?usr={get_super_user()}"
-        )
-    except ValueError as e:
-        click.echo(str(e))
+    click.echo(f"http://{settings.host}:{settings.port}/wallet?usr={get_super_user()}")


@lnbits_cli.command("delete-settings")
-@coro
-async def delete_settings():
+def delete_settings():
    """Deletes the settings"""

-    async with core_db.connect() as conn:
-        await conn.execute("DELETE from settings")
+    async def wrap():
+        async with core_db.connect() as conn:
+            await conn.execute("DELETE from settings")
+
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(wrap())


@db.command("migrate")
@@ -147,13 +89,9 @@ async def migrate_databases():

        current_versions = await get_dbversions(conn)
        core_version = current_versions.get("core", 0)
-        await run_migration(conn, core_migrations, "core", core_version)
+        await run_migration(conn, core_migrations, core_version)

-    # here is the first place we can be sure that the
-    # `installed_extensions` table has been created
-    await load_disabled_extension_list()
-
-    for ext in get_valid_extensions(False):
+    for ext in get_valid_extensions():
        current_version = current_versions.get(ext.code, 0)
        try:
            await migrate_extension_database(ext, current_version)
@@ -164,152 +102,16 @@ async def migrate_databases():


@db.command("versions")
-@coro
+def database_versions():
+    """Show current database versions"""
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(db_versions())
+
+
 async def db_versions():
    """Show current database versions"""
    async with core_db.connect() as conn:
-        click.echo(await get_dbversions(conn))
-
-
-@db.command("cleanup-wallets")
-@click.argument("days", type=int, required=False)
-@coro
-async def database_cleanup_wallets(days: Optional[int] = None):
-    """Delete all wallets that never had any transaction"""
-    async with core_db.connect() as conn:
-        delta = days or settings.cleanup_wallets_days
-        delta = delta * 24 * 60 * 60
-        await delete_unused_wallets(delta, conn)
-
-
-@db.command("cleanup-deleted-wallets")
-@coro
-async def database_cleanup_deleted_wallets():
-    """Delete all wallets that has been marked deleted"""
-    async with core_db.connect() as conn:
-        await remove_deleted_wallets(conn)
-
-
-@db.command("delete-wallet")
-@click.option("-w", "--wallet", required=True, help="ID of wallet to be deleted.")
-@coro
-async def database_delete_wallet(wallet: str):
-    """Mark wallet as deleted"""
-    async with core_db.connect() as conn:
-        count = await delete_wallet_by_id(wallet_id=wallet, conn=conn)
-        click.echo(f"Marked as deleted '{count}' rows.")
-
-
-@db.command("delete-wallet-payment")
-@click.option("-w", "--wallet", required=True, help="ID of wallet to be deleted.")
-@click.option("-c", "--checking-id", required=True, help="Payment checking Id.")
-@coro
-async def database_delete_wallet_payment(wallet: str, checking_id: str):
-    """Mark wallet as deleted"""
-    async with core_db.connect() as conn:
-        await delete_wallet_payment(
-            wallet_id=wallet, checking_id=checking_id, conn=conn
-        )
-
-
-@db.command("mark-payment-pending")
-@click.option("-c", "--checking-id", required=True, help="Payment checking Id.")
-@coro
-async def database_revert_payment(checking_id: str, pending: bool = True):
-    """Mark wallet as deleted"""
-    async with core_db.connect() as conn:
-        await update_payment_status(pending=pending, checking_id=checking_id, conn=conn)
-
-
-@db.command("cleanup-accounts")
-@click.argument("days", type=int, required=False)
-@coro
-async def database_cleanup_accounts(days: Optional[int] = None):
-    """Delete all accounts that have no wallets"""
-    async with core_db.connect() as conn:
-        delta = days or settings.cleanup_wallets_days
-        delta = delta * 24 * 60 * 60
-        await delete_accounts_no_wallets(delta, conn)
-
-
-@db.command("check-payments")
-@click.option("-d", "--days", help="Maximum age of payments in days.")
-@click.option("-l", "--limit", help="Maximum number of payments to be checked.")
-@click.option("-w", "--wallet", help="Only check for this wallet.")
-@click.option("-v", "--verbose", is_flag=True, help="Detailed log.")
-@coro
-async def check_invalid_payments(
-    days: Optional[int] = None,
-    limit: Optional[int] = None,
-    wallet: Optional[str] = None,
-    verbose: Optional[bool] = False,
-):
-    """Check payments that are settled in the DB but pending on the Funding Source"""
-    await check_admin_settings()
-    settled_db_payments = []
-
-    if verbose:
-        click.echo(f"Get Payments: days={days}, limit={limit}, wallet={wallet}")
-    async with core_db.connect() as conn:
-        delta = int(days) if days else 3  # default to 3 days
-        limit = int(limit) if limit else 1000
-        since = int(time.time()) - delta * 24 * 60 * 60
-
-        settled_db_payments = await get_payments(
-            complete=True,
-            incoming=True,
-            exclude_uncheckable=True,
-            since=since,
-            limit=limit,
-            wallet_id=wallet,
-            conn=conn,
-        )
-
-    click.echo("Settled Payments: " + str(len(settled_db_payments)))
-
-    wallets_module = importlib.import_module("lnbits.wallets")
-    wallet_class = getattr(wallets_module, settings.lnbits_backend_wallet_class)
-
-    funding_source: Wallet = wallet_class()
-
-    click.echo("Funding source: " + str(funding_source))
-
-    # payments that are settled in the DB, but not at the Funding source level
-    invalid_payments: List[Payment] = []
-    invalid_wallets = {}
-    for db_payment in settled_db_payments:
-        if verbose:
-            click.echo(
-                f"Checking Payment: '{db_payment.checking_id}' for wallet"
-                + f" '{db_payment.wallet_id}'."
-            )
-        payment_status = await funding_source.get_invoice_status(db_payment.checking_id)
-
-        if payment_status.pending:
-            invalid_payments.append(db_payment)
-            if db_payment.wallet_id not in invalid_wallets:
-                invalid_wallets[f"{db_payment.wallet_id}"] = [0, 0]
-            invalid_wallets[f"{db_payment.wallet_id}"][0] += 1
-            invalid_wallets[f"{db_payment.wallet_id}"][1] += db_payment.amount
-
-            click.echo(
-                "Invalid Payment:  '"
-                + " ".join(
-                    [
-                        db_payment.checking_id,
-                        db_payment.wallet_id,
-                        str(db_payment.amount / 1000).ljust(10),
-                        db_payment.memo or "",
-                    ]
-                )
-                + "'"
-            )
-
-    click.echo("Invalid Payments: " + str(len(invalid_payments)))
-    click.echo("\nInvalid Wallets: " + str(len(invalid_wallets)))
-    for w in invalid_wallets:
-        data = invalid_wallets[f"{w}"]
-        click.echo(" ".join([w, str(data[0]), str(data[1] / 1000).ljust(10)]))
+        return await get_dbversions(conn)


 async def load_disabled_extension_list() -> None:
@@ -318,184 +120,6 @@ async def load_disabled_extension_list() -> None:
    settings.lnbits_deactivated_extensions += inactive_extensions


-@extensions.command("list")
-@coro
-async def extensions_list():
-    """Show currently installed extensions"""
-    click.echo("Installed extensions:")
-
-    from lnbits.app import build_all_installed_extensions_list
-
-    for ext in await build_all_installed_extensions_list():
-        assert ext.installed_release, f"Extension {ext.id} has no installed_release"
-        click.echo(f"  - {ext.id} ({ext.installed_release.version})")
-
-
-@extensions.command("update")
-@click.argument("extension", required=False)
-@click.option("-a", "--all-extensions", is_flag=True, help="Update all extensions.")
-@click.option(
-    "-i", "--repo-index", help="Select the index of the repository to be used."
-)
-@click.option(
-    "-s",
-    "--source-repo",
-    help="""
-        Provide the repository URL to be used for updating.
-        The URL must be one present in `LNBITS_EXTENSIONS_MANIFESTS`
-        or configured via the Admin UI. This option is required only
-        if an extension is present in more than one repository.
-    """,
-)
-@click.option(
-    "-u",
-    "--url",
-    help="Use this option to update a running server. Eg: 'http://localhost:5000'.",
-)
-@click.option(
-    "-d",
-    "--admin-user",
-    help="Admin user ID (must have permissions to install extensions).",
-)
-@coro
-async def extensions_update(
-    extension: Optional[str] = None,
-    all_extensions: Optional[bool] = False,
-    repo_index: Optional[str] = None,
-    source_repo: Optional[str] = None,
-    url: Optional[str] = None,
-    admin_user: Optional[str] = None,
-):
-    """
-    Update extension to the latest version.
-    If an extension is not present it will be instaled.
-    """
-    if not extension and not all_extensions:
-        click.echo("Extension ID is required.")
-        click.echo("Or specify the '--all-extensions' flag to update all extensions")
-        return
-    if extension and all_extensions:
-        click.echo("Only one of extension ID or the '--all' flag must be specified")
-        return
-    if url and not _is_url(url):
-        click.echo(f"Invalid '--url' option value: {url}")
-        return
-
-    if not await _can_run_operation(url):
-        return
-
-    if extension:
-        await update_extension(extension, repo_index, source_repo, url, admin_user)
-        return
-
-    click.echo("Updating all extensions...")
-    installed_extensions = await get_installed_extensions()
-    updated_extensions = []
-    for e in installed_extensions:
-        try:
-            click.echo(f"""{"="*50} {e.id} {"="*(50-len(e.id))} """)
-            success, msg = await update_extension(
-                e.id, repo_index, source_repo, url, admin_user
-            )
-            if version:
-                updated_extensions.append(
-                    {"id": e.id, "success": success, "message": msg}
-                )
-        except Exception as ex:
-            click.echo(f"Failed to install extension '{e.id}': {ex}")
-
-    if len(updated_extensions) == 0:
-        click.echo("No extension was updated.")
-        return
-
-    for u in sorted(updated_extensions, key=lambda d: str(d["id"])):
-        status = "updated to  " if u["success"] else "not updated "
-        click.echo(
-            f"""'{u["id"]}' {" "*(20-len(str(u["id"])))}"""
-            + f""" - {status}: '{u["message"]}'"""
-        )
-
-
-@extensions.command("install")
-@click.argument("extension")
-@click.option(
-    "-i", "--repo-index", help="Select the index of the repository to be used."
-)
-@click.option(
-    "-s",
-    "--source-repo",
-    help="""
-        Provide the repository URL to be used for updating.
-        The URL must be one present in `LNBITS_EXTENSIONS_MANIFESTS`
-        or configured via the Admin UI. This option is required only
-        if an extension is present in more than one repository.
-    """,
-)
-@click.option(
-    "-u",
-    "--url",
-    help="Use this option to update a running server. Eg: 'http://localhost:5000'.",
-)
-@click.option(
-    "-d",
-    "--admin-user",
-    help="Admin user ID (must have permissions to install extensions).",
-)
-@coro
-async def extensions_install(
-    extension: str,
-    repo_index: Optional[str] = None,
-    source_repo: Optional[str] = None,
-    url: Optional[str] = None,
-    admin_user: Optional[str] = None,
-):
-    """Install a extension"""
-    click.echo(f"Installing {extension}... {repo_index}")
-    if url and not _is_url(url):
-        click.echo(f"Invalid '--url' option value: {url}")
-        return
-
-    if not await _can_run_operation(url):
-        return
-    await install_extension(extension, repo_index, source_repo, url, admin_user)
-
-
-@extensions.command("uninstall")
-@click.argument("extension")
-@click.option(
-    "-u",
-    "--url",
-    help="Use this option to update a running server. Eg: 'http://localhost:5000'.",
-)
-@click.option(
-    "-d",
-    "--admin-user",
-    help="Admin user ID (must have permissions to install extensions).",
-)
-@coro
-async def extensions_uninstall(
-    extension: str, url: Optional[str] = None, admin_user: Optional[str] = None
-):
-    """Uninstall a extension"""
-    click.echo(f"Uninstalling '{extension}'...")
-
-    if url and not _is_url(url):
-        click.echo(f"Invalid '--url' option value: {url}")
-        return
-
-    if not await _can_run_operation(url):
-        return
-    try:
-        await _call_uninstall_extension(extension, url, admin_user)
-        click.echo(f"Extension '{extension}' uninstalled.")
-    except HTTPException as ex:
-        click.echo(f"Failed to uninstall '{extension}' Error: '{ex.detail}'.")
-        return False, ex.detail
-    except Exception as ex:
-        click.echo(f"Failed to uninstall '{extension}': {str(ex)}.")
-        return False, str(ex)
-
-
 def main():
    """main function"""
    lnbits_cli()
@@ -503,216 +127,3 @@ def main():

 if __name__ == "__main__":
    main()
-
-
-async def install_extension(
-    extension: str,
-    repo_index: Optional[str] = None,
-    source_repo: Optional[str] = None,
-    url: Optional[str] = None,
-    admin_user: Optional[str] = None,
-) -> Tuple[bool, str]:
-    try:
-        release = await _select_release(extension, repo_index, source_repo)
-        if not release:
-            return False, "No release selected"
-
-        data = CreateExtension(
-            ext_id=extension,
-            archive=release.archive,
-            source_repo=release.source_repo,
-            version=release.version,
-        )
-        await _call_install_extension(data, url, admin_user)
-        click.echo(f"Extension '{extension}' ({release.version}) installed.")
-        return True, release.version
-    except HTTPException as ex:
-        click.echo(f"Failed to install '{extension}' Error: '{ex.detail}'.")
-        return False, ex.detail
-    except Exception as ex:
-        click.echo(f"Failed to install '{extension}': {str(ex)}.")
-        return False, str(ex)
-
-
-async def update_extension(
-    extension: str,
-    repo_index: Optional[str] = None,
-    source_repo: Optional[str] = None,
-    url: Optional[str] = None,
-    admin_user: Optional[str] = None,
-) -> Tuple[bool, str]:
-    try:
-        click.echo(f"Updating '{extension}' extension.")
-        installed_ext = await get_installed_extension(extension)
-        if not installed_ext:
-            click.echo(
-                f"Extension '{extension}' is not installed. Preparing to install..."
-            )
-            return await install_extension(extension, repo_index, source_repo, url)
-
-        click.echo(f"Current '{extension}' version: {installed_ext.installed_version}.")
-
-        assert (
-            installed_ext.installed_release
-        ), "Cannot find previously installed release. Please uninstall first."
-
-        release = await _select_release(extension, repo_index, source_repo)
-        if not release:
-            return False, "No release selected."
-        if (
-            release.version == installed_ext.installed_version
-            and release.source_repo == installed_ext.installed_release.source_repo
-        ):
-            click.echo(f"Extension '{extension}' already up to date.")
-            return False, "Already up to date"
-
-        click.echo(f"Updating '{extension}' extension to version: {release.version }")
-
-        data = CreateExtension(
-            ext_id=extension,
-            archive=release.archive,
-            source_repo=release.source_repo,
-            version=release.version,
-        )
-
-        await _call_install_extension(data, url, admin_user)
-        click.echo(f"Extension '{extension}' updated.")
-        return True, release.version
-    except HTTPException as ex:
-        click.echo(f"Failed to update '{extension}' Error: '{ex.detail}.")
-        return False, ex.detail
-    except Exception as ex:
-        click.echo(f"Failed to update '{extension}': {str(ex)}.")
-        return False, str(ex)
-
-
-async def _select_release(
-    extension: str,
-    repo_index: Optional[str] = None,
-    source_repo: Optional[str] = None,
-) -> Optional[ExtensionRelease]:
-    all_releases = await InstallableExtension.get_extension_releases(extension)
-    if len(all_releases) == 0:
-        click.echo(f"No repository found for extension '{extension}'.")
-        return None
-
-    latest_repo_releases = _get_latest_release_per_repo(all_releases)
-
-    if source_repo:
-        if source_repo not in latest_repo_releases:
-            click.echo(f"Repository not found: '{source_repo}'")
-            return None
-        return latest_repo_releases[source_repo]
-
-    if len(latest_repo_releases) == 1:
-        return latest_repo_releases[list(latest_repo_releases.keys())[0]]
-
-    repos = list(latest_repo_releases.keys())
-    repos.sort()
-    if not repo_index:
-        click.echo("Multiple repos found. Please select one using:")
-        click.echo("   --repo-index   option for index of the repo, or")
-        click.echo("   --source-repo  option for the manifest URL")
-        click.echo("")
-        click.echo("Repositories: ")
-
-        for index, repo in enumerate(repos):
-            release = latest_repo_releases[repo]
-            click.echo(f"  [{index}] {repo} --> {release.version}")
-        click.echo("")
-        return None
-
-    if not repo_index.isnumeric() or not 0 <= int(repo_index) < len(repos):
-        click.echo(f"--repo-index must be between '0' and '{len(repos) - 1}'")
-        return None
-
-    return latest_repo_releases[repos[int(repo_index)]]
-
-
-def _get_latest_release_per_repo(all_releases):
-    latest_repo_releases = {}
-    for release in all_releases:
-        try:
-            if not release.is_version_compatible:
-                continue
-            # do not remove, parsing also validates
-            release_version = version.parse(release.version)
-            if release.source_repo not in latest_repo_releases:
-                latest_repo_releases[release.source_repo] = release
-                continue
-            if release_version > version.parse(
-                latest_repo_releases[release.source_repo].version
-            ):
-                latest_repo_releases[release.source_repo] = release
-        except version.InvalidVersion as ex:
-            logger.warning(f"Invalid version {release.name}: {ex}")
-    return latest_repo_releases
-
-
-async def _call_install_extension(
-    data: CreateExtension, url: Optional[str], user_id: Optional[str] = None
-):
-    if url:
-        user_id = user_id or get_super_user()
-        async with httpx.AsyncClient() as client:
-            resp = await client.post(
-                f"{url}/api/v1/extension?usr={user_id}", json=data.dict(), timeout=40
-            )
-            resp.raise_for_status()
-    else:
-        await api_install_extension(data, User(id="mock_id"))
-
-
-async def _call_uninstall_extension(
-    extension: str, url: Optional[str], user_id: Optional[str] = None
-):
-    if url:
-        user_id = user_id or get_super_user()
-        async with httpx.AsyncClient() as client:
-            resp = await client.delete(
-                f"{url}/api/v1/extension/{extension}?usr={user_id}", timeout=40
-            )
-            resp.raise_for_status()
-    else:
-        await api_uninstall_extension(extension, User(id="mock_id"))
-
-
-async def _can_run_operation(url) -> bool:
-    await check_admin_settings()
-    if await _is_lnbits_started(url):
-        if not url:
-            click.echo("LNbits server is started. Please either:")
-            click.echo(
-                f"  - use the '--url' option. Eg: --url=http://{settings.host}:{settings.port}"
-            )
-            click.echo(
-                f"  - stop the server running at 'http://{settings.host}:{settings.port}'"
-            )
-
-            return False
-    elif url:
-        click.echo(
-            "The option '--url' has been provided,"
-            + f" but no server found runnint at '{url}'"
-        )
-        return False
-
-    return True
-
-
-async def _is_lnbits_started(url: Optional[str]):
-    try:
-        url = url or f"http://{settings.host}:{settings.port}/api/v1/health"
-        async with httpx.AsyncClient() as client:
-            await client.get(url)
-            return True
-    except Exception:
-        return False
-
-
-def _is_url(url):
-    try:
-        result = urlparse(url)
-        return all([result.scheme, result.netloc])
-    except ValueError:
-        return False
@@ -1,38 +1,24 @@
-from fastapi import APIRouter, FastAPI
+from fastapi import APIRouter

 from .db import core_app_extra, db
 from .views.admin_api import admin_router
 from .views.api import api_router
-from .views.auth_api import auth_router
-from .views.extension_api import extension_router

 # this compat is needed for usermanager extension
 from .views.generic import generic_router, update_user_extension
 from .views.node_api import node_router, public_node_router, super_node_router
-from .views.payment_api import payment_router
 from .views.public_api import public_router
-from .views.tinyurl_api import tinyurl_router
-from .views.wallet_api import wallet_router
-from .views.webpush_api import webpush_router
-from .views.websocket_api import websocket_router

 # backwards compatibility for extensions
 core_app = APIRouter(tags=["Core"])


-def init_core_routers(app: FastAPI):
+def init_core_routers(app):
    app.include_router(core_app)
    app.include_router(generic_router)
-    app.include_router(auth_router)
-    app.include_router(admin_router)
+    app.include_router(public_router)
+    app.include_router(api_router)
    app.include_router(node_router)
-    app.include_router(extension_router)
    app.include_router(super_node_router)
    app.include_router(public_node_router)
-    app.include_router(public_router)
-    app.include_router(payment_router)
-    app.include_router(wallet_router)
-    app.include_router(api_router)
-    app.include_router(websocket_router)
-    app.include_router(tinyurl_router)
-    app.include_router(webpush_router)
+    app.include_router(admin_router)
@@ -1,12 +1,11 @@
 import datetime
 import json
-from time import time
 from typing import Any, Dict, List, Literal, Optional
 from urllib.parse import urlparse
 from uuid import UUID, uuid4

 import shortuuid
-from passlib.context import CryptContext
+from bolt11.decode import decode

 from lnbits.core.db import db
 from lnbits.core.models import WalletType
@@ -22,14 +21,11 @@ from lnbits.settings import (

 from .models import (
    BalanceCheck,
-    CreateUser,
    Payment,
    PaymentFilters,
    PaymentHistoryPoint,
    TinyURL,
-    UpdateUserPassword,
    User,
-    UserConfig,
    Wallet,
    WebPushSubscription,
 )
@@ -38,48 +34,8 @@ from .models import (
 # --------


-async def create_user(
-    data: CreateUser, user_config: Optional[UserConfig] = None
-) -> User:
-    if not settings.new_accounts_allowed:
-        raise ValueError("Account creation is disabled.")
-    if await get_account_by_username(data.username):
-        raise ValueError("Username already exists.")
-
-    if data.email and await get_account_by_email(data.email):
-        raise ValueError("Email already exists.")
-
-    pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-
-    user_id = uuid4().hex
-    tsph = db.timestamp_placeholder
-    now = int(time())
-    await db.execute(
-        f"""
-            INSERT INTO accounts
-            (id, email, username, pass, extra, created_at, updated_at)
-            VALUES (?, ?, ?, ?, ?, {tsph}, {tsph})
-        """,
-        (
-            user_id,
-            data.email,
-            data.username,
-            pwd_context.hash(data.password),
-            json.dumps(dict(user_config)) if user_config else "{}",
-            now,
-            now,
-        ),
-    )
-    new_account = await get_account(user_id=user_id)
-    assert new_account, "Newly created account couldn't be retrieved"
-    return new_account
-
-
 async def create_account(
-    conn: Optional[Connection] = None,
-    user_id: Optional[str] = None,
-    email: Optional[str] = None,
-    user_config: Optional[UserConfig] = None,
+    conn: Optional[Connection] = None, user_id: Optional[str] = None
 ) -> User:
    if user_id:
        user_uuid4 = UUID(hex=user_id, version=4)
@@ -87,15 +43,7 @@ async def create_account(
    else:
        user_id = uuid4().hex

-    extra = json.dumps(dict(user_config)) if user_config else "{}"
-    now = int(time())
-    await (conn or db).execute(
-        f"""
-        INSERT INTO accounts (id, email, extra, created_at, updated_at)
-        VALUES (?, ?, ?, {db.timestamp_placeholder}, {db.timestamp_placeholder})
-        """,
-        (user_id, email, extra, now, now),
-    )
+    await (conn or db).execute("INSERT INTO accounts (id) VALUES (?)", (user_id,))

    new_account = await get_account(user_id=user_id, conn=conn)
    assert new_account, "Newly created account couldn't be retrieved"
@@ -103,176 +51,19 @@ async def create_account(
    return new_account


-async def update_account(
-    user_id: str,
-    username: Optional[str] = None,
-    email: Optional[str] = None,
-    user_config: Optional[UserConfig] = None,
-) -> Optional[User]:
-    user = await get_account(user_id)
-    assert user, "User not found"
-
-    if email:
-        assert not user.email or email == user.email, "Cannot change email."
-        account = await get_account_by_email(email)
-        assert not account or account.id == user_id, "Email already in use."
-
-    if username:
-        assert not user.username or username == user.username, "Cannot change username."
-        account = await get_account_by_username(username)
-        assert not account or account.id == user_id, "Username already in exists."
-
-    username = user.username or username
-    email = user.email or email
-    extra = user_config or user.config
-
-    now = int(time())
-    await db.execute(
-        f"""
-            UPDATE accounts SET (username, email, extra, updated_at) =
-            (?, ?, ?, {db.timestamp_placeholder})
-            WHERE id = ?
-        """,
-        (
-            username,
-            email,
-            json.dumps(dict(extra)) if extra else "{}",
-            now,
-            user_id,
-        ),
-    )
-
-    user = await get_user(user_id)
-    assert user, "Updated account couldn't be retrieved"
-    return user
-
-
 async def get_account(
    user_id: str, conn: Optional[Connection] = None
 ) -> Optional[User]:
    row = await (conn or db).fetchone(
-        """
-           SELECT id, email, username, created_at, updated_at, extra
-           FROM accounts WHERE id = ?
-        """,
-        (user_id,),
-    )
-
-    user = User(**row) if row else None
-    if user and row["extra"]:
-        user.config = UserConfig(**json.loads(row["extra"]))
-    return user
-
-
-async def delete_accounts_no_wallets(
-    time_delta: int,
-    conn: Optional[Connection] = None,
-) -> None:
-    await (conn or db).execute(
-        f"""
-        DELETE FROM accounts
-        WHERE NOT EXISTS (
-            SELECT wallets.id FROM wallets WHERE wallets.user = accounts.id
-        ) AND updated_at < {db.timestamp_placeholder}
-        """,
-        (int(time()) - time_delta,),
-    )
-
-
-async def get_user_password(user_id: str) -> Optional[str]:
-    row = await db.fetchone(
-        "SELECT pass FROM accounts WHERE id = ?",
-        (user_id,),
-    )
-    if not row:
-        return None
-
-    return row[0]
-
-
-async def verify_user_password(user_id: str, password: str) -> bool:
-    existing_password = await get_user_password(user_id)
-    if not existing_password:
-        return False
-
-    pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-    return pwd_context.verify(password, existing_password)
-
-
-# todo: , conn: Optional[Connection] = None ??
-async def update_user_password(data: UpdateUserPassword) -> Optional[User]:
-    assert data.password == data.password_repeat, "Passwords do not match."
-
-    # old accounts do not have a pasword
-    if await get_user_password(data.user_id):
-        assert data.password_old, "Missing old password"
-        old_pwd_ok = await verify_user_password(data.user_id, data.password_old)
-        assert old_pwd_ok, "Invalid credentials."
-
-    pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-
-    now = int(time())
-    await db.execute(
-        f"""
-        UPDATE accounts SET pass = ?, updated_at = {db.timestamp_placeholder}
-        WHERE id = ?
-        """,
-        (
-            pwd_context.hash(data.password),
-            now,
-            data.user_id,
-        ),
-    )
-
-    user = await get_user(data.user_id)
-    assert user, "Updated account couldn't be retrieved"
-    return user
-
-
-async def get_account_by_username(
-    username: str, conn: Optional[Connection] = None
-) -> Optional[User]:
-    row = await (conn or db).fetchone(
-        """
-        SELECT id, username, email, created_at, updated_at
-        FROM accounts WHERE username = ?
-        """,
-        (username,),
+        "SELECT id, email, pass as password FROM accounts WHERE id = ?", (user_id,)
    )

    return User(**row) if row else None


-async def get_account_by_email(
-    email: str, conn: Optional[Connection] = None
-) -> Optional[User]:
-    row = await (conn or db).fetchone(
-        """
-        SELECT id, username, email, created_at, updated_at
-        FROM accounts WHERE email = ?
-        """,
-        (email,),
-    )
-
-    return User(**row) if row else None
-
-
-async def get_account_by_username_or_email(
-    username_or_email: str, conn: Optional[Connection] = None
-) -> Optional[User]:
-    user = await get_account_by_username(username_or_email, conn)
-    if not user:
-        user = await get_account_by_email(username_or_email, conn)
-    return user
-
-
 async def get_user(user_id: str, conn: Optional[Connection] = None) -> Optional[User]:
    user = await (conn or db).fetchone(
-        """
-        SELECT id, email, username, pass, extra, created_at, updated_at
-        FROM accounts WHERE id = ?
-        """,
-        (user_id,),
+        "SELECT id, email FROM accounts WHERE id = ?", (user_id,)
    )

    if user:
@@ -296,7 +87,6 @@ async def get_user(user_id: str, conn: Optional[Connection] = None) -> Optional[
    return User(
        id=user["id"],
        email=user["email"],
-        username=user["username"],
        extensions=[
            e[0] for e in extensions if User.is_extension_for_user(e[0], user["id"])
        ],
@@ -304,8 +94,6 @@ async def get_user(user_id: str, conn: Optional[Connection] = None) -> Optional[
        admin=user["id"] == settings.super_user
        or user["id"] in settings.lnbits_admin_users,
        super_user=user["id"] == settings.super_user,
-        has_password=True if user["pass"] else False,
-        config=UserConfig(**json.loads(user["extra"])) if user["extra"] else None,
    )


@@ -322,7 +110,6 @@ async def add_installed_extension(
            dict(ext.installed_release) if ext.installed_release else None
        ),
        "dependencies": ext.dependencies,
-        "payments": [dict(p) for p in ext.payments] if ext.payments else None,
    }

    version = ext.installed_release.version if ext.installed_release else ""
@@ -395,15 +182,13 @@ async def drop_extension_db(*, ext_id: str, conn: Optional[Connection] = None) -
    )


-async def get_installed_extension(
-    ext_id: str, conn: Optional[Connection] = None
-) -> Optional[InstallableExtension]:
+async def get_installed_extension(ext_id: str, conn: Optional[Connection] = None):
    row = await (conn or db).fetchone(
        "SELECT * FROM installed_extensions WHERE id = ?",
        (ext_id,),
    )

-    return InstallableExtension.from_row(row) if row else None
+    return dict(row) if row else None


 async def get_installed_extensions(
@@ -447,11 +232,10 @@ async def create_wallet(
    conn: Optional[Connection] = None,
 ) -> Wallet:
    wallet_id = uuid4().hex
-    now = int(time())
    await (conn or db).execute(
-        f"""
-        INSERT INTO wallets (id, name, "user", adminkey, inkey, created_at, updated_at)
-        VALUES (?, ?, ?, ?, ?, {db.timestamp_placeholder}, {db.timestamp_placeholder})
+        """
+        INSERT INTO wallets (id, name, "user", adminkey, inkey)
+        VALUES (?, ?, ?, ?, ?)
        """,
        (
            wallet_id,
@@ -459,8 +243,6 @@ async def create_wallet(
            user_id,
            uuid4().hex,
            uuid4().hex,
-            now,
-            now,
        ),
    )

@@ -477,10 +259,7 @@ async def update_wallet(
    conn: Optional[Connection] = None,
 ) -> Optional[Wallet]:
    set_clause = []
-    values: list = []
-    set_clause.append(f"updated_at = {db.timestamp_placeholder}")
-    now = int(time())
-    values.append(now)
+    values = []
    if name:
        set_clause.append("name = ?")
        values.append(name)
@@ -502,48 +281,13 @@ async def update_wallet(
 async def delete_wallet(
    *, user_id: str, wallet_id: str, conn: Optional[Connection] = None
 ) -> None:
-    now = int(time())
    await (conn or db).execute(
-        f"""
+        """
        UPDATE wallets
-        SET deleted = true, updated_at = {db.timestamp_placeholder}
+        SET deleted = true
        WHERE id = ? AND "user" = ?
        """,
-        (now, wallet_id, user_id),
-    )
-
-
-async def delete_wallet_by_id(
-    *, wallet_id: str, conn: Optional[Connection] = None
-) -> Optional[int]:
-    now = int(time())
-    result = await (conn or db).execute(
-        f"""
-        UPDATE wallets
-        SET deleted = true, updated_at = {db.timestamp_placeholder}
-        WHERE id = ?
-        """,
-        (now, wallet_id),
-    )
-    return result.rowcount
-
-
-async def remove_deleted_wallets(conn: Optional[Connection] = None) -> None:
-    await (conn or db).execute("DELETE FROM wallets WHERE deleted = true")
-
-
-async def delete_unused_wallets(
-    time_delta: int,
-    conn: Optional[Connection] = None,
-) -> None:
-    await (conn or db).execute(
-        f"""
-        DELETE FROM wallets
-        WHERE (
-            SELECT COUNT(*) FROM apipayments WHERE wallet = wallets.id
-        ) = 0 AND updated_at < {db.timestamp_placeholder}
-        """,
-        (int(time()) - time_delta,),
+        (wallet_id, user_id),
    )


@@ -569,8 +313,7 @@ async def get_wallet_for_key(
    row = await (conn or db).fetchone(
        """
        SELECT *, COALESCE((SELECT balance FROM balances WHERE wallet = wallets.id), 0)
-        AS balance_msat FROM wallets
-        WHERE (adminkey = ? OR inkey = ?) AND deleted = false
+        AS balance_msat FROM wallets WHERE adminkey = ? OR inkey = ?
        """,
        (key, key),
    )
@@ -618,7 +361,6 @@ async def get_standalone_payment(
        SELECT *
        FROM apipayments
        WHERE {clause}
-        ORDER BY amount
        LIMIT 1
        """,
        tuple(values),
@@ -793,7 +535,6 @@ async def create_payment(
    memo: str,
    fee: int = 0,
    preimage: Optional[str] = None,
-    expiry: Optional[datetime.datetime] = None,
    pending: bool = True,
    extra: Optional[Dict] = None,
    webhook: Optional[str] = None,
@@ -804,6 +545,14 @@ async def create_payment(
    previous_payment = await get_standalone_payment(checking_id, conn=conn)
    assert previous_payment is None, "Payment already exists"

+    invoice = decode(payment_request)
+
+    if invoice.expiry:
+        expiration_date = datetime.datetime.fromtimestamp(invoice.date + invoice.expiry)
+    else:
+        # assume maximum bolt11 expiry of 31 days to be on the safe side
+        expiration_date = datetime.datetime.now() + datetime.timedelta(days=31)
+
    await (conn or db).execute(
        """
        INSERT INTO apipayments
@@ -827,7 +576,7 @@ async def create_payment(
                else None
            ),
            webhook,
-            db.datetime_to_timestamp(expiry) if expiry else None,
+            db.datetime_to_timestamp(expiration_date),
        ),
    )

@@ -1030,16 +779,6 @@ async def check_internal_pending(
        return row["pending"]


-async def mark_webhook_sent(payment_hash: str, status: int) -> None:
-    await db.execute(
-        """
-        UPDATE apipayments SET webhook_status = ?
-        WHERE hash = ?
-        """,
-        (status, payment_hash),
-    )
-
-
 # balance_check
 # -------------

@@ -1125,8 +864,6 @@ async def get_admin_settings(is_super_user: bool = False) -> Optional[AdminSetti
        return None
    row_dict = dict(sets)
    row_dict.pop("super_user")
-    row_dict.pop("auth_all_methods")
-
    admin_settings = AdminSettings(
        is_super_user=is_super_user,
        lnbits_allowed_funding_sources=settings.lnbits_allowed_funding_sources,
@@ -1,6 +1,6 @@
 import importlib
 import re
-from typing import Any, Optional
+from typing import Any
 from uuid import UUID

 import httpx
@@ -25,13 +25,12 @@ async def migrate_extension_database(ext: Extension, current_version):
        )

    async with ext_db.connect() as ext_conn:
-        await run_migration(ext_conn, ext_migrations, ext.code, current_version)
+        await run_migration(ext_conn, ext_migrations, current_version)


-async def run_migration(
-    db: Connection, migrations_module: Any, db_name: str, current_version: int
-):
+async def run_migration(db: Connection, migrations_module: Any, current_version: int):
    matcher = re.compile(r"^m(\d\d\d)_")
+    db_name = migrations_module.__name__.split(".")[-2]
    for key, migrate in migrations_module.__dict__.items():
        match = matcher.match(key)
        if match:
@@ -48,64 +47,24 @@ async def run_migration(
                        await update_migration_version(conn, db_name, version)


-async def stop_extension_background_work(
-    ext_id: str, user: str, access_token: Optional[str] = None
-):
+async def stop_extension_background_work(ext_id: str, user: str):
    """
    Stop background work for extension (like asyncio.Tasks, WebSockets, etc).
-    Extensions SHOULD expose a `api_stop()` function and/or a DELETE enpoint
-    at the root level of their API.
+    Extensions SHOULD expose a DELETE enpoint at the root level of their API.
+    This function tries first to call the endpoint using `http`
+    and if it fails it tries using `https`.
    """
-    stopped = await _stop_extension_background_work(ext_id)
-
-    if not stopped:
-        # fallback to REST API call
-        await _stop_extension_background_work_via_api(ext_id, user, access_token)
-
-
-async def _stop_extension_background_work(ext_id) -> bool:
-    upgrade_hash = settings.extension_upgrade_hash(ext_id) or ""
-    ext = Extension(ext_id, True, False, upgrade_hash=upgrade_hash)
-
-    try:
-        logger.info(f"Stopping background work for extension '{ext.module_name}'.")
-        old_module = importlib.import_module(ext.module_name)
-
-        # Extensions must expose an `{ext_id}_stop()` function at the module level
-        # The `api_stop()` function is for backwards compatibility (will be deprecated)
-        stop_fns = [f"{ext_id}_stop", "api_stop"]
-        stop_fn_name = next((fn for fn in stop_fns if hasattr(old_module, fn)), None)
-        assert stop_fn_name, "No stop function found for '{ext.module_name}'"
-
-        await getattr(old_module, stop_fn_name)()
-
-        logger.info(f"Stopped background work for extension '{ext.module_name}'.")
-    except Exception as ex:
-        logger.warning(f"Failed to stop background work for '{ext.module_name}'.")
-        logger.warning(ex)
-        return False
-
-    return True
-
-
-async def _stop_extension_background_work_via_api(ext_id, user, access_token):
-    logger.info(
-        f"Stopping background work for extension '{ext_id}' using the REST API."
-    )
    async with httpx.AsyncClient() as client:
        try:
            url = f"http://{settings.host}:{settings.port}/{ext_id}/api/v1?usr={user}"
-            headers = (
-                {"Authorization": "Bearer " + access_token} if access_token else None
-            )
-            resp = await client.delete(url=url, headers=headers)
-            resp.raise_for_status()
-            logger.info(f"Stopped background work for extension '{ext_id}'.")
+            await client.delete(url)
        except Exception as ex:
-            logger.warning(
-                f"Failed to stop background work for '{ext_id}' using the REST API."
-            )
            logger.warning(ex)
+            try:
+                # try https
+                url = f"https://{settings.host}:{settings.port}/{ext_id}/api/v1?usr={user}"
+            except Exception as ex:
+                logger.warning(ex)


 def to_valid_user_id(user_id: str) -> UUID:
@@ -1,5 +1,4 @@
 import datetime
-from time import time

 from loguru import logger
 from sqlalchemy.exc import OperationalError
@@ -394,80 +393,3 @@ async def m015_create_push_notification_subscriptions_table(db):
        );
    """
    )
-
-
-async def m016_add_username_column_to_accounts(db):
-    """
-    Adds username column to accounts.
-    """
-    try:
-        await db.execute("ALTER TABLE accounts ADD COLUMN username TEXT")
-        await db.execute("ALTER TABLE accounts ADD COLUMN extra TEXT")
-    except OperationalError:
-        pass
-
-
-async def m017_add_timestamp_columns_to_accounts_and_wallets(db):
-    """
-    Adds created_at and updated_at column to accounts and wallets.
-    """
-    try:
-        await db.execute(
-            "ALTER TABLE accounts "
-            f"ADD COLUMN created_at TIMESTAMP DEFAULT {db.timestamp_column_default}"
-        )
-        await db.execute(
-            "ALTER TABLE accounts "
-            f"ADD COLUMN updated_at TIMESTAMP DEFAULT {db.timestamp_column_default}"
-        )
-        await db.execute(
-            "ALTER TABLE wallets "
-            f"ADD COLUMN created_at TIMESTAMP DEFAULT {db.timestamp_column_default}"
-        )
-        await db.execute(
-            "ALTER TABLE wallets "
-            f"ADD COLUMN updated_at TIMESTAMP DEFAULT {db.timestamp_column_default}"
-        )
-
-        # # set their wallets created_at with the first payment
-        # await db.execute(
-        #     """
-        #     UPDATE wallets SET created_at = (
-        #         SELECT time FROM apipayments
-        #         WHERE apipayments.wallet = wallets.id
-        #         ORDER BY time ASC LIMIT 1
-        #     )
-        #  """
-        # )
-
-        # # then set their accounts created_at with the wallet
-        # await db.execute(
-        #     """
-        #     UPDATE accounts SET created_at = (
-        #         SELECT created_at FROM wallets
-        #         WHERE wallets.user = accounts.id
-        #         ORDER BY created_at ASC LIMIT 1
-        #     )
-        #  """
-        # )
-
-        # set all to now where they are null
-        now = int(time())
-        await db.execute(
-            f"""
-            UPDATE wallets SET created_at = {db.timestamp_placeholder}
-            WHERE created_at IS NULL
-            """,
-            (now,),
-        )
-        await db.execute(
-            f"""
-            UPDATE accounts SET created_at = {db.timestamp_placeholder}
-            WHERE created_at IS NULL
-            """,
-            (now,),
-        )
-
-    except OperationalError as exc:
-        logger.error(f"Migration 17 failed: {exc}")
-        pass
@@ -10,31 +10,26 @@ from typing import Callable, Dict, List, Optional

 from ecdsa import SECP256k1, SigningKey
 from fastapi import Query
+from lnurl import encode as lnurl_encode
 from loguru import logger
 from pydantic import BaseModel

 from lnbits.db import Connection, FilterModel, FromRowModel
 from lnbits.helpers import url_for
-from lnbits.lnurl import encode as lnurl_encode
 from lnbits.settings import settings
 from lnbits.wallets import get_wallet_class
-from lnbits.wallets.base import PaymentPendingStatus, PaymentStatus
+from lnbits.wallets.base import PaymentStatus


-class BaseWallet(BaseModel):
+class Wallet(BaseModel):
    id: str
    name: str
+    user: str
    adminkey: str
    inkey: str
-    balance_msat: int
-
-
-class Wallet(BaseWallet):
-    user: str
    currency: Optional[str]
+    balance_msat: int
    deleted: bool
-    created_at: Optional[int] = None
-    updated_at: Optional[int] = None

    @property
    def balance(self) -> int:
@@ -84,31 +79,14 @@ class WalletTypeInfo:
    wallet: Wallet


-class UserConfig(BaseModel):
-    email_verified: Optional[bool] = False
-    first_name: Optional[str] = None
-    last_name: Optional[str] = None
-    display_name: Optional[str] = None
-    picture: Optional[str] = None
-    # Auth provider, possible values:
-    # - "env": the user was created automatically by the system
-    # - "lnbits": the user was created via register form (username/pass or user_id only)
-    # - "google | github | ...": the user was created using an SSO provider
-    provider: Optional[str] = "lnbits"  # auth provider
-
-
 class User(BaseModel):
    id: str
    email: Optional[str] = None
-    username: Optional[str] = None
    extensions: List[str] = []
    wallets: List[Wallet] = []
+    password: Optional[str] = None
    admin: bool = False
    super_user: bool = False
-    has_password: bool = False
-    config: Optional[UserConfig] = None
-    created_at: Optional[int] = None
-    updated_at: Optional[int] = None

    @property
    def wallet_ids(self) -> List[str]:
@@ -129,43 +107,6 @@ class User(BaseModel):
        return False


-class CreateUser(BaseModel):
-    email: Optional[str] = Query(default=None)
-    username: str = Query(default=..., min_length=2, max_length=20)
-    password: str = Query(default=..., min_length=8, max_length=50)
-    password_repeat: str = Query(default=..., min_length=8, max_length=50)
-
-
-class UpdateUser(BaseModel):
-    user_id: str
-    email: Optional[str] = Query(default=None)
-    username: Optional[str] = Query(default=..., min_length=2, max_length=20)
-    config: Optional[UserConfig] = None
-
-
-class UpdateUserPassword(BaseModel):
-    user_id: str
-    password: str = Query(default=..., min_length=8, max_length=50)
-    password_repeat: str = Query(default=..., min_length=8, max_length=50)
-    password_old: Optional[str] = Query(default=None, min_length=8, max_length=50)
-    username: Optional[str] = Query(default=..., min_length=2, max_length=20)
-
-
-class UpdateSuperuserPassword(BaseModel):
-    username: str = Query(default=..., min_length=2, max_length=20)
-    password: str = Query(default=..., min_length=8, max_length=50)
-    password_repeat: str = Query(default=..., min_length=8, max_length=50)
-
-
-class LoginUsr(BaseModel):
-    usr: str
-
-
-class LoginUsernamePassword(BaseModel):
-    username: str
-    password: str
-
-
 class Payment(FromRowModel):
    checking_id: str
    pending: bool
@@ -258,7 +199,7 @@ class Payment(FromRowModel):
        conn: Optional[Connection] = None,
    ) -> PaymentStatus:
        if self.is_uncheckable:
-            return PaymentPendingStatus()
+            return PaymentStatus(None)

        logger.debug(
            f"Checking {'outgoing' if self.is_out else 'incoming'} "
@@ -280,18 +221,11 @@ class Payment(FromRowModel):
                f"expired {expiration_date}"
            )
            await self.delete(conn)
-        # wait at least 15 minutes before deleting failed outgoing payments
        elif self.is_out and status.failed:
-            if self.time + 900 < int(time.time()):
-                logger.warning(
-                    f"Deleting outgoing failed payment {self.checking_id}: {status}"
-                )
-                await self.delete(conn)
-            else:
-                logger.warning(
-                    f"Tried to delete outgoing payment {self.checking_id}: "
-                    "skipping because it's not old enough"
-                )
+            logger.warning(
+                f"Deleting outgoing failed payment {self.checking_id}: {status}"
+            )
+            await self.delete(conn)
        elif not status.pending:
            logger.info(
                f"Marking '{'in' if self.is_in else 'out'}' "
@@ -341,12 +275,8 @@ class BalanceCheck(BaseModel):
        return cls(wallet=row["wallet"], service=row["service"], url=row["url"])


-def _do_nothing(*_):
-    pass
-
-
 class CoreAppExtra:
-    register_new_ext_routes: Callable = _do_nothing
+    register_new_ext_routes: Callable
    register_new_ratelimiter: Callable


@@ -382,7 +312,6 @@ class CreateLnurl(BaseModel):
    amount: int
    comment: Optional[str] = None
    description: Optional[str] = None
-    unit: Optional[str] = None


 class CreateInvoice(BaseModel):
@@ -1,27 +1,24 @@
 import asyncio
-import datetime
 import json
-import time
 from io import BytesIO
 from pathlib import Path
 from typing import Dict, List, Optional, Tuple, TypedDict
 from urllib.parse import parse_qs, urlparse

 import httpx
-from bolt11 import Bolt11
-from bolt11 import decode as bolt11_decode
 from cryptography.hazmat.primitives import serialization
 from fastapi import Depends, WebSocket
+from lnurl import LnurlErrorResponse
+from lnurl import decode as decode_lnurl
 from loguru import logger
 from py_vapid import Vapid
 from py_vapid.utils import b64urlencode

+from lnbits import bolt11
 from lnbits.core.db import db
 from lnbits.db import Connection
 from lnbits.decorators import WalletTypeInfo, require_admin_key
 from lnbits.helpers import url_for
-from lnbits.lnurl import LnurlErrorResponse
-from lnbits.lnurl import decode as decode_lnurl
 from lnbits.settings import (
    EditableSettings,
    SuperSettings,
@@ -31,12 +28,7 @@ from lnbits.settings import (
 )
 from lnbits.utils.exchange_rates import fiat_amount_as_satoshis, satoshis_amount_as_fiat
 from lnbits.wallets import FAKE_WALLET, get_wallet_class, set_wallet_class
-from lnbits.wallets.base import (
-    PaymentPendingStatus,
-    PaymentResponse,
-    PaymentStatus,
-    PaymentSuccessStatus,
-)
+from lnbits.wallets.base import PaymentResponse, PaymentStatus

 from .crud import (
    check_internal,
@@ -47,7 +39,6 @@ from .crud import (
    create_wallet,
    delete_wallet_payment,
    get_account,
-    get_payments,
    get_standalone_payment,
    get_super_settings,
    get_total_balance,
@@ -59,7 +50,7 @@ from .crud import (
    update_super_user,
 )
 from .helpers import to_valid_user_id
-from .models import Payment, UserConfig, Wallet
+from .models import Payment, Wallet


 class PaymentFailure(Exception):
@@ -125,9 +116,8 @@ async def create_invoice(
    if not amount > 0:
        raise InvoiceFailure("Amountless invoices not supported.")

-    user_wallet = await get_wallet(wallet_id, conn=conn)
-    if not user_wallet:
-        raise InvoiceFailure(f"Could not fetch wallet '{wallet_id}'.")
+    if await get_wallet(wallet_id, conn=conn) is None:
+        raise InvoiceFailure("Wallet does not exist.")

    invoice_memo = None if description_hash else memo

@@ -138,14 +128,6 @@ async def create_invoice(
        amount, wallet_id, currency=currency, extra=extra, conn=conn
    )

-    if settings.is_wallet_max_balance_exceeded(
-        user_wallet.balance_msat / 1000 + amount_sat
-    ):
-        raise InvoiceFailure(
-            f"Wallet balance  cannot exceed "
-            f"{settings.lnbits_wallet_limit_max_balance} sats."
-        )
-
    ok, checking_id, payment_request, error_message = await wallet.create_invoice(
        amount=amount_sat,
        memo=invoice_memo,
@@ -156,7 +138,7 @@ async def create_invoice(
    if not ok or not payment_request or not checking_id:
        raise InvoiceFailure(error_message or "unexpected backend error.")

-    invoice = bolt11_decode(payment_request)
+    invoice = bolt11.decode(payment_request)

    amount_msat = 1000 * amount_sat
    await create_payment(
@@ -165,7 +147,6 @@ async def create_invoice(
        payment_request=payment_request,
        payment_hash=invoice.payment_hash,
        amount=amount_msat,
-        expiry=get_bolt11_expiry(invoice),
        memo=memo,
        extra=extra,
        webhook=webhook,
@@ -194,22 +175,23 @@ async def pay_invoice(
    If the payment is still in flight, we hope that some other process
    will regularly check for the payment.
    """
-    try:
-        invoice = bolt11_decode(payment_request)
-    except Exception:
-        raise InvoiceFailure("Bolt11 decoding failed.")
+    invoice = bolt11.decode(payment_request)

    if not invoice.amount_msat or not invoice.amount_msat > 0:
-        raise InvoiceFailure("Amountless invoices not supported.")
+        raise ValueError("Amountless invoices not supported.")
    if max_sat and invoice.amount_msat > max_sat * 1000:
-        raise InvoiceFailure("Amount in invoice is too high.")
-
-    await check_wallet_limits(wallet_id, conn, invoice.amount_msat)
+        raise ValueError("Amount in invoice is too high.")

+    fee_reserve_msat = fee_reserve(invoice.amount_msat)
    async with db.reuse_conn(conn) if conn else db.connect() as conn:
        temp_id = invoice.payment_hash
        internal_id = f"internal_{invoice.payment_hash}"

+        if invoice.amount_msat == 0:
+            raise ValueError("Amountless invoices not supported.")
+        if max_sat and invoice.amount_msat > max_sat * 1000:
+            raise ValueError("Amount in invoice is too high.")
+
        _, extra = await calculate_fiat_amounts(
            invoice.amount_msat / 1000, wallet_id, extra=extra, conn=conn
        )
@@ -221,7 +203,6 @@ async def pay_invoice(
            payment_hash: str
            amount: int
            memo: str
-            expiry: Optional[datetime.datetime]
            extra: Optional[Dict]

        payment_kwargs: PaymentKwargs = PaymentKwargs(
@@ -229,7 +210,6 @@ async def pay_invoice(
            payment_request=payment_request,
            payment_hash=invoice.payment_hash,
            amount=-invoice.amount_msat,
-            expiry=get_bolt11_expiry(invoice),
            memo=description or invoice.description or "",
            extra=extra,
        )
@@ -243,9 +223,6 @@ async def pay_invoice(
        # (pending only)
        internal_checking_id = await check_internal(invoice.payment_hash, conn=conn)
        if internal_checking_id:
-            fee_reserve_total_msat = fee_reserve_total(
-                invoice.amount_msat, internal=True
-            )
            # perform additional checks on the internal payment
            # the payment hash is not enough to make sure that this is the same invoice
            internal_invoice = await get_standalone_payment(
@@ -262,22 +239,19 @@ async def pay_invoice(
            # create a new payment from this wallet
            new_payment = await create_payment(
                checking_id=internal_id,
-                fee=0 + abs(fee_reserve_total_msat),
+                fee=0,
                pending=False,
                conn=conn,
                **payment_kwargs,
            )
        else:
-            fee_reserve_total_msat = fee_reserve_total(
-                invoice.amount_msat, internal=False
-            )
            logger.debug(f"creating temporary payment with id {temp_id}")
            # create a temporary payment here so we can check if
            # the balance is enough in the next step
            try:
                new_payment = await create_payment(
                    checking_id=temp_id,
-                    fee=-abs(fee_reserve_total_msat),
+                    fee=-fee_reserve_msat,
                    conn=conn,
                    **payment_kwargs,
                )
@@ -291,18 +265,14 @@ async def pay_invoice(
        assert wallet, "Wallet for balancecheck could not be fetched"
        if wallet.balance_msat < 0:
            logger.debug("balance is too low, deleting temporary payment")
-            if (
-                not internal_checking_id
-                and wallet.balance_msat > -fee_reserve_total_msat
-            ):
+            if not internal_checking_id and wallet.balance_msat > -fee_reserve_msat:
                raise PaymentFailure(
-                    f"You must reserve at least ({round(fee_reserve_total_msat/1000)}"
-                    "  sat) to cover potential routing fees."
+                    f"You must reserve at least ({round(fee_reserve_msat/1000)} sat) to"
+                    " cover potential routing fees."
                )
            raise PermissionError("Insufficient balance.")

    if internal_checking_id:
-        service_fee_msat = service_fee(invoice.amount_msat, internal=True)
        logger.debug(f"marking temporary payment as not pending {internal_checking_id}")
        # mark the invoice from the other side as not pending anymore
        # so the other side only has access to his new money when we are sure
@@ -319,8 +289,6 @@ async def pay_invoice(
        logger.debug(f"enqueuing internal invoice {internal_checking_id}")
        await internal_invoice_queue.put(internal_checking_id)
    else:
-        fee_reserve_msat = fee_reserve(invoice.amount_msat, internal=False)
-        service_fee_msat = service_fee(invoice.amount_msat, internal=False)
        logger.debug(f"backend: sending payment {temp_id}")
        # actually pay the external invoice
        WALLET = get_wallet_class()
@@ -342,10 +310,7 @@ async def pay_invoice(
                await update_payment_details(
                    checking_id=temp_id,
                    pending=payment.ok is not True,
-                    fee=-(
-                        abs(payment.fee_msat if payment.fee_msat else 0)
-                        + abs(service_fee_msat)
-                    ),
+                    fee=payment.fee_msat,
                    preimage=payment.preimage,
                    new_checking_id=payment.checking_id,
                    conn=conn,
@@ -373,73 +338,9 @@ async def pay_invoice(
                f" database: {temp_id}"
            )

-    # credit service fee wallet
-    if settings.lnbits_service_fee_wallet and service_fee_msat:
-        new_payment = await create_payment(
-            wallet_id=settings.lnbits_service_fee_wallet,
-            fee=0,
-            amount=abs(service_fee_msat),
-            memo="Service fee",
-            checking_id="service_fee" + temp_id,
-            payment_request=payment_request,
-            payment_hash=invoice.payment_hash,
-            pending=False,
-        )
    return invoice.payment_hash


-async def check_wallet_limits(wallet_id, conn, amount_msat):
-    await check_time_limit_between_transactions(conn, wallet_id)
-    await check_wallet_daily_withdraw_limit(conn, wallet_id, amount_msat)
-
-
-async def check_time_limit_between_transactions(conn, wallet_id):
-    limit = settings.lnbits_wallet_limit_secs_between_trans
-    if not limit or limit <= 0:
-        return
-
-    payments = await get_payments(
-        since=int(time.time()) - limit,
-        wallet_id=wallet_id,
-        limit=1,
-        conn=conn,
-    )
-
-    if len(payments) == 0:
-        return
-
-    raise ValueError(
-        f"The time limit of {limit} seconds between payments has been reached."
-    )
-
-
-async def check_wallet_daily_withdraw_limit(conn, wallet_id, amount_msat):
-    limit = settings.lnbits_wallet_limit_daily_max_withdraw
-    if not limit or limit <= 0:
-        return
-
-    payments = await get_payments(
-        since=int(time.time()) - 60 * 60 * 24,
-        outgoing=True,
-        wallet_id=wallet_id,
-        limit=1,
-        conn=conn,
-    )
-    if len(payments) == 0:
-        return
-
-    total = 0
-    for pay in payments:
-        total += pay.amount
-    total = total - amount_msat
-    if limit * 1000 + total < 0:
-        raise ValueError(
-            "Daily withdrawal limit of "
-            + str(settings.lnbits_wallet_limit_daily_max_withdraw)
-            + " sats reached."
-        )
-
-
 async def redeem_lnurl_withdraw(
    wallet_id: str,
    lnurl_request: str,
@@ -453,8 +354,7 @@ async def redeem_lnurl_withdraw(

    res = {}

-    headers = {"User-Agent": settings.user_agent}
-    async with httpx.AsyncClient(headers=headers) as client:
+    async with httpx.AsyncClient() as client:
        lnurl = decode_lnurl(lnurl_request)
        r = await client.get(str(lnurl))
        res = r.json()
@@ -488,8 +388,7 @@ async def redeem_lnurl_withdraw(
    except Exception:
        pass

-    headers = {"User-Agent": settings.user_agent}
-    async with httpx.AsyncClient(headers=headers) as client:
+    async with httpx.AsyncClient() as client:
        try:
            await client.get(res["callback"], params=params)
        except Exception:
@@ -552,8 +451,7 @@ async def perform_lnurlauth(

    sig = key.sign_digest_deterministic(k1, sigencode=encode_strict_der)

-    headers = {"User-Agent": settings.user_agent}
-    async with httpx.AsyncClient(headers=headers) as client:
+    async with httpx.AsyncClient() as client:
        assert key.verifying_key, "LNURLauth verifying_key does not exist"
        r = await client.get(
            callback,
@@ -582,10 +480,10 @@ async def check_transaction_status(
        wallet_id, payment_hash, conn=conn
    )
    if not payment:
-        return PaymentPendingStatus()
+        return PaymentStatus(None)
    if not payment.pending:
        # note: before, we still checked the status of the payment again
-        return PaymentSuccessStatus(fee_msat=payment.fee)
+        return PaymentStatus(True, fee_msat=payment.fee)

    status: PaymentStatus = await payment.check_status()
    return status
@@ -593,33 +491,12 @@ async def check_transaction_status(

 # WARN: this same value must be used for balance check and passed to
 # WALLET.pay_invoice(), it may cause a vulnerability if the values differ
-def fee_reserve(amount_msat: int, internal: bool = False) -> int:
-    if internal:
-        return 0
+def fee_reserve(amount_msat: int) -> int:
    reserve_min = settings.lnbits_reserve_fee_min
    reserve_percent = settings.lnbits_reserve_fee_percent
    return max(int(reserve_min), int(amount_msat * reserve_percent / 100.0))


-def service_fee(amount_msat: int, internal: bool = False) -> int:
-    service_fee_percent = settings.lnbits_service_fee
-    fee_max = settings.lnbits_service_fee_max * 1000
-    if settings.lnbits_service_fee_wallet:
-        if internal and settings.lnbits_service_fee_ignore_internal:
-            return 0
-        fee_percentage = int(amount_msat / 100 * service_fee_percent)
-        if fee_max > 0 and fee_percentage > fee_max:
-            return fee_max
-        else:
-            return fee_percentage
-    else:
-        return 0
-
-
-def fee_reserve_total(amount_msat: int, internal: bool = False) -> int:
-    return fee_reserve(amount_msat, internal) + service_fee(amount_msat, internal)
-
-
 async def send_payment_notification(wallet: Wallet, payment: Payment):
    await websocketUpdater(
        wallet.id,
@@ -679,10 +556,6 @@ async def check_admin_settings():
        ):
            send_admin_user_to_saas()

-        account = await get_account(settings.super_user)
-        if account and account.config and account.config.provider == "env":
-            settings.first_install = True
-
        logger.success(
            "✔️ Admin UI is enabled. run `poetry run lnbits-cli superuser` "
            "to get the superuser."
@@ -714,14 +587,11 @@ async def check_webpush_settings():

 def update_cached_settings(sets_dict: dict):
    for key, value in sets_dict.items():
-        if key in readonly_variables:
-            continue
-        if key not in settings.dict().keys():
-            continue
-        try:
-            setattr(settings, key, value)
-        except Exception:
-            logger.warning(f"Failed overriding setting: {key}, value: {value}")
+        if key not in readonly_variables:
+            try:
+                setattr(settings, key, value)
+            except Exception:
+                logger.warning(f"Failed overriding setting: {key}, value: {value}")
    if "super_user" in sets_dict:
        setattr(settings, "super_user", sets_dict["super_user"])

@@ -731,9 +601,7 @@ async def init_admin_settings(super_user: Optional[str] = None) -> SuperSettings
    if super_user:
        account = await get_account(super_user)
    if not account:
-        account = await create_account(
-            user_id=super_user, user_config=UserConfig(provider="env")
-        )
+        account = await create_account(user_id=super_user)
    if not account.wallets or len(account.wallets) == 0:
        await create_wallet(user_id=account.id)

@@ -782,11 +650,3 @@ async def get_balance_delta() -> Tuple[int, int, int]:
    if error_message:
        raise Exception(error_message)
    return node_balance - total_balance, node_balance, total_balance
-
-
-def get_bolt11_expiry(invoice: Bolt11) -> datetime.datetime:
-    if invoice.expiry:
-        return datetime.datetime.fromtimestamp(invoice.date + invoice.expiry)
-    else:
-        # assume maximum bolt11 expiry of 31 days to be on the safe side
-        return datetime.datetime.now() + datetime.timedelta(days=31)
@@ -1,37 +0,0 @@
-"""Keycloak SSO Login Helper
-"""
-
-from typing import Optional
-
-import httpx
-from fastapi_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
-
-
-class KeycloakSSO(SSOBase):
-    """Class providing login via Keycloak OAuth"""
-
-    provider = "keycloak"
-    scope = ["openid", "email", "profile"]
-    discovery_url = ""
-
-    async def openid_from_response(
-        self, response: dict, session: Optional["httpx.AsyncClient"] = None
-    ) -> OpenID:
-        """Return OpenID from user information provided by Keycloak"""
-        return OpenID(
-            email=response.get("email", ""),
-            provider=self.provider,
-            id=response.get("sub"),
-            first_name=response.get("given_name"),
-            last_name=response.get("family_name"),
-            display_name=response.get("name"),
-            picture=response.get("picture"),
-        )
-
-    async def get_discovery_document(self) -> DiscoveryDocument:
-        """Get document containing handy urls"""
-        async with httpx.AsyncClient() as session:
-            response = await session.get(self.discovery_url)
-            content = response.json()
-
-            return content
@@ -0,0 +1,36 @@
+new Vue({
+  el: '#vue',
+  mixins: [windowMixin],
+  data: function () {
+    return {
+      disclaimerDialog: {
+        show: false,
+        data: {},
+        description: ''
+      },
+      walletName: ''
+    }
+  },
+  computed: {
+    formatDescription() {
+      return LNbits.utils.convertMarkdown(this.description)
+    }
+  },
+  methods: {
+    createWallet: function () {
+      LNbits.api.createAccount(this.walletName).then(res => {
+        window.location = '/wallet?usr=' + res.data.user + '&wal=' + res.data.id
+      })
+    },
+    processing: function () {
+      this.$q.notify({
+        timeout: 0,
+        message: 'Processing...',
+        icon: null
+      })
+    }
+  },
+  created() {
+    this.description = SITE_DESCRIPTION
+  }
+})
@@ -176,93 +176,3 @@ Vue.component('lnbits-node-info', {
    </div>
  `
 })
-
-Vue.component('lnbits-stat', {
-  props: ['title', 'amount', 'msat', 'btc'],
-  computed: {
-    value: function () {
-      return (
-        this.amount ??
-        (this.btc
-          ? LNbits.utils.formatSat(this.btc)
-          : LNbits.utils.formatMsat(this.msat))
-      )
-    }
-  },
-  template: `
-        <q-card>
-        <q-card-section>
-          <div class='text-overline text-primary'>
-            {{ title }}
-          </div>
-          <div>
-            <span class='text-h4 text-bold q-my-none'>{{ value }}</span>
-            <span class='text-h5' v-if='msat != undefined'>sats</span>
-            <span class='text-h5' v-if='btc != undefined'>BTC</span>
-          </div>
-        </q-card-section>
-        </q-card>
-      `
-})
-
-Vue.component('lnbits-channel-balance', {
-  props: ['balance', 'color'],
-  methods: {
-    formatMsat: function (msat) {
-      return LNbits.utils.formatMsat(msat)
-    }
-  },
-  template: `
-    <div>
-        <div class="row items-center justify-between">
-          <span class="text-weight-thin">
-            Local: {{ formatMsat(balance.local_msat) }}
-            sats
-          </span>
-          <span class="text-weight-thin">
-            Remote: {{ formatMsat(balance.remote_msat) }}
-            sats
-          </span>
-        </div>
-
-        <q-linear-progress
-          rounded
-          size="25px"
-          :value="balance.local_msat / balance.total_msat"
-          :color="color"
-          :style="\`color: #\${this.color}\`"
-        >
-          <div class="absolute-full flex flex-center">
-            <q-badge
-              color="white"
-              text-color="accent"
-              :label="formatMsat(balance.total_msat) + ' sats'"
-            >
-              {{ balance.alias }}
-            </q-badge>
-          </div>
-       </q-linear-progress>
-    </div>
-  `
-})
-
-Vue.component('lnbits-date', {
-  props: ['ts'],
-  computed: {
-    date: function () {
-      return Quasar.utils.date.formatDate(
-        new Date(this.ts * 1000),
-        'YYYY-MM-DD HH:mm'
-      )
-    },
-    dateFrom: function () {
-      return moment(this.date).fromNow()
-    }
-  },
-  template: `
-    <div>
-      <q-tooltip>{{ this.date }}</q-tooltip>
-      {{ this.dateFrom }}
-    </div>
-  `
-})
@@ -1,6 +1,7 @@
 // update cache version every time there is a new deployment
 // so the service worker reinitializes the cache
-const CURRENT_CACHE = 'lnbits-{{ cache_version }}-'
+const CACHE_VERSION = 58
+const CURRENT_CACHE = `lnbits-${CACHE_VERSION}-`

 const getApiKey = request => {
  let api_key = request.headers.get('X-Api-Key')
@@ -16,7 +17,8 @@ self.addEventListener('activate', evt =>
    caches.keys().then(cacheNames => {
      return Promise.all(
        cacheNames.map(cacheName => {
-          if (!cacheName.startsWith(CURRENT_CACHE)) {
+          const currentCacheVersion = cacheName.split('-').slice(-2, 2)
+          if (currentCacheVersion !== CACHE_VERSION) {
            return caches.delete(cacheName)
          }
        })
@@ -90,7 +90,6 @@ new Vue({
  mixins: [windowMixin],
  data: function () {
    return {
-      origin: window.location.origin,
      user: LNbits.map.user(window.user),
      receive: {
        show: false,
@@ -114,8 +113,7 @@ new Vue({
        data: {
          request: '',
          amount: 0,
-          comment: '',
-          unit: 'sat'
+          comment: ''
        },
        paymentChecker: null,
        copy: {
@@ -151,7 +149,7 @@ new Vue({
          descending: true,
          rowsNumber: 10
        },
-        search: null,
+        filter: null,
        loading: false
      },
      paymentsCSV: {
@@ -243,8 +241,6 @@ new Vue({
        location: window.location
      },
      balance: 0,
-      fiatBalance: 0,
-      mobileSimple: false,
      credit: 0,
      update: {
        name: null,
@@ -260,26 +256,12 @@ new Vue({
        return LNbits.utils.formatSat(this.balance || this.g.wallet.sat)
      }
    },
-    formattedFiatBalance() {
-      if (this.fiatBalance) {
-        return LNbits.utils.formatCurrency(
-          this.fiatBalance.toFixed(2),
-          this.g.wallet.currency
-        )
-      }
-    },
    filteredPayments: function () {
-      var q = this.paymentsTable.search
+      var q = this.paymentsTable.filter
      if (!q || q === '') return this.payments

      return LNbits.utils.search(this.payments, q)
    },
-    paymentsOmitter() {
-      if (this.$q.screen.lt.md && this.mobileSimple) {
-        return this.payments.length > 0 ? [this.payments[0]] : []
-      }
-      return this.payments
-    },
    canPay: function () {
      if (!this.parse.invoice) return false
      return this.parse.invoice.sat <= this.balance
@@ -288,10 +270,12 @@ new Vue({
      return this.payments.findIndex(payment => payment.pending) !== -1
    }
  },
-  methods: {
+  filters: {
    msatoshiFormat: function (value) {
      return LNbits.utils.formatSat(value / 1000)
-    },
+    }
+  },
+  methods: {
    paymentTableRowKey: function (row) {
      return row.payment_hash + row.amount
    },
@@ -353,6 +337,33 @@ new Vue({
      this.parse.camera.show = false
      this.focusInput('textArea')
    },
+    updateBalance: function (credit) {
+      LNbits.api
+        .request(
+          'PUT',
+          '/admin/api/v1/topup/?usr=' + this.g.user.id,
+          this.g.user.wallets[0].adminkey,
+          {
+            amount: credit,
+            id: this.g.wallet.id
+          }
+        )
+        .then(response => {
+          this.$q.notify({
+            type: 'positive',
+            message:
+              'Success! Added ' +
+              credit +
+              ' sats to ' +
+              this.g.user.wallets[0].id,
+            icon: null
+          })
+          this.balance += parseInt(credit)
+        })
+        .catch(function (error) {
+          LNbits.utils.notifyApiError(error)
+        })
+    },
    closeParseDialog: function () {
      setTimeout(() => {
        clearInterval(this.parse.paymentChecker)
@@ -360,6 +371,7 @@ new Vue({
    },
    onPaymentReceived: function (paymentHash) {
      this.fetchPayments()
+      this.fetchBalance()

      if (this.receive.paymentHash === paymentHash) {
        this.receive.show = false
@@ -588,6 +600,7 @@ new Vue({
                  clearInterval(this.parse.paymentChecker)
                  dismissPaymentMsg()
                  this.fetchPayments()
+                  this.fetchBalance()
                }
              })
          }, 2000)
@@ -610,8 +623,7 @@ new Vue({
          this.parse.lnurlpay.description_hash,
          this.parse.data.amount * 1000,
          this.parse.lnurlpay.description.slice(0, 120),
-          this.parse.data.comment,
-          this.parse.data.unit
+          this.parse.data.comment
        )
        .then(response => {
          this.parse.show = false
@@ -628,6 +640,8 @@ new Vue({
                  dismissPaymentMsg()
                  clearInterval(this.parse.paymentChecker)
                  this.fetchPayments()
+                  this.fetchBalance()
+
                  // show lnurlpay success action
                  if (response.data.success_action) {
                    switch (response.data.success_action.tag) {
@@ -746,9 +760,23 @@ new Vue({
        })
    },
    fetchPayments: function (props) {
-      const params = LNbits.utils.prepareFilterQuery(this.paymentsTable, props)
+      // Props are passed by qasar when pagination or sorting changes
+      if (props) {
+        this.paymentsTable.pagination = props.pagination
+      }
+      let pagination = this.paymentsTable.pagination
+      this.paymentsTable.loading = true
+      const query = {
+        limit: pagination.rowsPerPage,
+        offset: (pagination.page - 1) * pagination.rowsPerPage,
+        sortby: pagination.sortBy ?? 'time',
+        direction: pagination.descending ? 'desc' : 'asc'
+      }
+      if (this.paymentsTable.filter) {
+        query.search = this.paymentsTable.filter
+      }
      return LNbits.api
-        .getPayments(this.g.wallet, params)
+        .getPayments(this.g.wallet, query)
        .then(response => {
          this.paymentsTable.loading = false
          this.paymentsTable.pagination.rowsNumber = response.data.total
@@ -763,51 +791,20 @@ new Vue({
    },
    fetchBalance: function () {
      LNbits.api.getWallet(this.g.wallet).then(response => {
-        this.balance = Math.floor(response.data.balance / 1000)
+        this.balance = Math.round(response.data.balance / 1000)
        EventHub.$emit('update-wallet-balance', [
          this.g.wallet.id,
          this.balance
        ])
      })
-      if (this.g.wallet.currency) {
-        this.updateFiatBalance()
-      }
-    },
-    updateFiatBalance() {
-      if (!this.g.wallet.currency) return 0
-      LNbits.api
-        .request('POST', `/api/v1/conversion`, null, {
-          amount: this.balance || this.g.wallet.sat,
-          to: this.g.wallet.currency
-        })
-        .then(response => {
-          this.fiatBalance = response.data[this.g.wallet.currency]
-        })
-        .catch(e => console.error(e))
-    },
-    formatFiat(currency, amount) {
-      return LNbits.utils.formatCurrency(amount, currency)
-    },
-    updateBalanceCallback: function (res) {
-      this.balance += res.value
    },
    exportCSV: function () {
      // status is important for export but it is not in paymentsTable
      // because it is manually added with payment detail link and icons
      // and would cause duplication in the list
-      const pagination = this.paymentsTable.pagination
-      const query = {
-        sortby: pagination.sortBy ?? 'time',
-        direction: pagination.descending ? 'desc' : 'asc'
-      }
-      const params = new URLSearchParams(query)
-      LNbits.api.getPayments(this.g.wallet, params).then(response => {
+      LNbits.api.getPayments(this.g.wallet, {}).then(response => {
        const payments = response.data.data.map(LNbits.map.payment)
-        LNbits.utils.exportCSV(
-          this.paymentsCSV.columns,
-          payments,
-          this.g.wallet.name + '-payments'
-        )
+        LNbits.utils.exportCSV(this.paymentsCSV.columns, payments)
      })
    },
    pasteToTextArea: function () {
@@ -826,21 +823,20 @@ new Vue({
    }
  },
  created: function () {
-    let urlParams = new URLSearchParams(window.location.search)
-    if (urlParams.has('lightning') || urlParams.has('lnurl')) {
-      this.parse.data.request =
-        urlParams.get('lightning') || urlParams.get('lnurl')
-      this.decodeRequest()
-      this.parse.show = true
-    }
-    if (this.$q.screen.lt.md) {
-      this.mobileSimple = true
-    }
+    this.fetchBalance()
    this.fetchPayments()

    this.update.name = this.g.wallet.name
    this.update.currency = this.g.wallet.currency
-    this.receive.units = ['sat', ...window.currencies]
+
+    LNbits.api
+      .request('GET', '/api/v1/currencies')
+      .then(response => {
+        this.receive.units = ['sat', ...response.data]
+      })
+      .catch(err => {
+        LNbits.utils.notifyApiError(err)
+      })
  },
  mounted: function () {
    // show disclaimer
@@ -848,11 +844,11 @@ new Vue({
      this.disclaimerDialog.show = true
      this.$q.localStorage.set('lnbits.disclaimerShown', true)
    }
+
    // listen to incoming payments
    LNbits.events.onInvoicePaid(this.g.wallet, payment =>
      this.onPaymentReceived(payment.payment_hash)
    )
-    eventReactionWebocket(wallet.id)
  }
 })

@@ -8,8 +8,8 @@ from lnbits.core.crud import (
    get_balance_notify,
    get_wallet,
    get_webpush_subscriptions_for_user,
-    mark_webhook_sent,
 )
+from lnbits.core.db import db
 from lnbits.core.models import Payment
 from lnbits.core.services import (
    get_balance_delta,
@@ -17,16 +17,29 @@ from lnbits.core.services import (
    switch_to_voidwallet,
 )
 from lnbits.settings import get_wallet_class, settings
-from lnbits.tasks import send_push_notification
+from lnbits.tasks import (
+    SseListenersDict,
+    create_permanent_task,
+    create_task,
+    register_invoice_listener,
+    send_push_notification,
+)

-api_invoice_listeners: Dict[str, asyncio.Queue] = {}
+api_invoice_listeners: Dict[str, asyncio.Queue] = SseListenersDict(
+    "api_invoice_listeners"
+)
+
+
+def register_killswitch():
+    """
+    Registers a killswitch which will check lnbits-status repository for a signal from
+    LNbits and will switch to VoidWallet if the killswitch is triggered.
+    """
+    logger.debug("Starting killswitch task")
+    create_permanent_task(killswitch_task)


 async def killswitch_task():
-    """
-    killswitch will check lnbits-status repository for a signal from
-    LNbits and will switch to VoidWallet if the killswitch is triggered.
-    """
    while True:
        WALLET = get_wallet_class()
        if settings.lnbits_killswitch and WALLET.__class__.__name__ != "VoidWallet":
@@ -41,7 +54,7 @@ async def killswitch_task():
                                "Switching to VoidWallet. Killswitch triggered."
                            )
                            await switch_to_voidwallet()
-                except (httpx.RequestError, httpx.HTTPStatusError):
+                except (httpx.ConnectError, httpx.RequestError):
                    logger.error(
                        "Cannot fetch lnbits status manifest."
                        f" {settings.lnbits_status_manifest}"
@@ -49,11 +62,17 @@ async def killswitch_task():
        await asyncio.sleep(settings.lnbits_killswitch_interval * 60)


-async def watchdog_task():
+async def register_watchdog():
    """
    Registers a watchdog which will check lnbits balance and nodebalance
    and will switch to VoidWallet if the watchdog delta is reached.
    """
+    # TODO: implement watchdog properly
+    # logger.debug("Starting watchdog task")
+    # create_permanent_task(watchdog_task)
+
+
+async def watchdog_task():
    while True:
        WALLET = get_wallet_class()
        if settings.lnbits_watchdog and WALLET.__class__.__name__ != "VoidWallet":
@@ -68,46 +87,46 @@ async def watchdog_task():
        await asyncio.sleep(settings.lnbits_watchdog_interval * 60)


+def register_task_listeners():
+    """
+    Registers an invoice listener queue for the core tasks. Incoming payments in this
+    queue will eventually trigger the signals sent to all other extensions
+    and fulfill other core tasks such as dispatching webhooks.
+    """
+    invoice_paid_queue = asyncio.Queue(5)
+    # we register invoice_paid_queue to receive all incoming invoices
+    register_invoice_listener(invoice_paid_queue, "core/tasks.py")
+    # register a worker that will react to invoices
+    create_task(wait_for_paid_invoices(invoice_paid_queue))
+
+
 async def wait_for_paid_invoices(invoice_paid_queue: asyncio.Queue):
    """
-    This task dispatches events to all api_invoice_listeners,
-    webhooks, push notifications and balance notifications.
+    This worker dispatches events to all extensions,
+    dispatches webhooks and balance notifys.
    """
    while True:
        payment = await invoice_paid_queue.get()
        logger.trace("received invoice paid event")
-        # dispatch api_invoice_listeners
+        # send information to sse channel
        await dispatch_api_invoice_listeners(payment)
-        # payment notification
        wallet = await get_wallet(payment.wallet_id)
        if wallet:
            await send_payment_notification(wallet, payment)
        # dispatch webhook
        if payment.webhook and not payment.webhook_status:
            await dispatch_webhook(payment)
+
        # dispatch balance_notify
        url = await get_balance_notify(payment.wallet_id)
        if url:
-            headers = {"User-Agent": settings.user_agent}
-            async with httpx.AsyncClient(headers=headers) as client:
+            async with httpx.AsyncClient() as client:
                try:
                    r = await client.post(url, timeout=4)
-                    r.raise_for_status()
-                    await mark_webhook_sent(payment.payment_hash, r.status_code)
-                except httpx.HTTPStatusError as exc:
-                    status_code = exc.response.status_code
-                    await mark_webhook_sent(payment.payment_hash, status_code)
-                    logger.warning(
-                        f"balance_notify returned a bad status_code: {status_code} "
-                        f"while requesting {exc.request.url!r}."
-                    )
-                    logger.warning(exc)
-                except httpx.RequestError as exc:
-                    await mark_webhook_sent(payment.payment_hash, -1)
-                    logger.warning(f"Could not send balance_notify to {url}")
-                    logger.warning(exc)
+                    await mark_webhook_sent(payment, r.status_code)
+                except (httpx.ConnectError, httpx.RequestError):
+                    pass

-        # dispatch push notification
        await send_payment_push_notification(payment)


@@ -117,12 +136,10 @@ async def dispatch_api_invoice_listeners(payment: Payment):
    """
    for chan_name, send_channel in api_invoice_listeners.items():
        try:
-            logger.debug(f"api invoice listener: sending paid event to {chan_name}")
+            logger.debug(f"sending invoice paid event to {chan_name}")
            send_channel.put_nowait(payment)
        except asyncio.QueueFull:
-            logger.error(
-                f"api invoice listener: QueueFull, removing {send_channel}:{chan_name}"
-            )
+            logger.error(f"removing sse listener {send_channel}:{chan_name}")
            api_invoice_listeners.pop(chan_name)


@@ -133,24 +150,25 @@ async def dispatch_webhook(payment: Payment):
    logger.debug("sending webhook", payment.webhook)

    if not payment.webhook:
-        return await mark_webhook_sent(payment.payment_hash, -1)
+        return await mark_webhook_sent(payment, -1)

-    headers = {"User-Agent": settings.user_agent}
-    async with httpx.AsyncClient(headers=headers) as client:
+    async with httpx.AsyncClient() as client:
        data = payment.dict()
        try:
            r = await client.post(payment.webhook, json=data, timeout=40)
-            r.raise_for_status()
-            await mark_webhook_sent(payment.payment_hash, r.status_code)
-        except httpx.HTTPStatusError as exc:
-            await mark_webhook_sent(payment.payment_hash, exc.response.status_code)
-            logger.warning(
-                f"webhook returned a bad status_code: {exc.response.status_code} "
-                f"while requesting {exc.request.url!r}."
-            )
-        except httpx.RequestError:
-            await mark_webhook_sent(payment.payment_hash, -1)
-            logger.warning(f"Could not send webhook to {payment.webhook}")
+            await mark_webhook_sent(payment, r.status_code)
+        except (httpx.ConnectError, httpx.RequestError):
+            await mark_webhook_sent(payment, -1)
+
+
+async def mark_webhook_sent(payment: Payment, status: int) -> None:
+    await db.execute(
+        """
+        UPDATE apipayments SET webhook_status = ?
+        WHERE hash = ?
+        """,
+        (status, payment.payment_hash),
+    )


 async def send_payment_push_notification(payment: Payment):
@@ -168,8 +186,6 @@ async def send_payment_push_notification(payment: Payment):
            body += f"\r\n{payment.memo}"

        for subscription in subscriptions:
-            # todo: review permissions when user-id-only not allowed
-            # todo: replace all this logic with websockets?
            url = (
                f"https://{subscription.host}/wallet?usr={wallet.user}&wal={wallet.id}"
            )
@@ -7,89 +7,135 @@
        <div class="col">
          <p>Funding Source Info</p>
          <ul>
-            <li
-              v-text="'Funding Source: '+ settings.lnbits_backend_wallet_class"
-            ></li>
-            <li
-              v-text="'Node Balance: ' + (auditData.node_balance_msats /
-              1000).toLocaleString() + ' sats'"
-            ></li>
-            <li
-              v-text="'LNbits Balance: ' + (auditData.lnbits_balance_msats /
-              1000).toLocaleString() + ' sats'"
-            ></li>
-            <li
-              v-text="'Reserve Percent: ' + (auditData.node_balance_msats /
-              auditData.lnbits_balance_msats * 100).toFixed(2) + ' %'"
-            ></li>
+            {%raw%}
+            <li>Funding Source: {{settings.lnbits_backend_wallet_class}}</li>
+            <li>
+              Node Balance: {{(auditData.node_balance_msats /
+              1000).toLocaleString()}} sats
+            </li>
+            <li>
+              LNbits Balance: {{(auditData.lnbits_balance_msats /
+              1000).toLocaleString()}} sats
+            </li>
+            <li>
+              Reserve Percent: {{(auditData.node_balance_msats /
+              auditData.lnbits_balance_msats * 100).toFixed(2)}} %
+            </li>
+            {%endraw%}
          </ul>
          <br />
        </div>
+      </div>
+      <div class="row">
        <div class="col">
-          {% if LNBITS_NODE_UI_AVAILABLE %}
-          <p>Node Management</p>
-          <q-toggle
-            label="Node UI"
-            v-model="formData.lnbits_node_ui"
-          ></q-toggle>
-          <q-toggle
-            v-if="formData.lnbits_node_ui"
-            label="Public node UI"
-            v-model="formData.lnbits_public_node_ui"
-          ></q-toggle>
-          <br />
-          <q-toggle
-            v-if="formData.lnbits_node_ui"
-            label="Transactions Tab (Disable on large CLN nodes)"
-            v-model="formData.lnbits_node_ui_transactions"
-          ></q-toggle>
-          {% else %}
-          <p>Node Management not supported by active funding source</p>
-          {% endif %}
+          <div v-if="'{{LNBITS_NODE_UI_AVAILABLE}}' === 'True'">
+            <div>Node Management</div>
+            <q-toggle
+              label="Node UI"
+              v-model="formData.lnbits_node_ui"
+            ></q-toggle>
+            <q-toggle
+              v-if="formData.lnbits_node_ui"
+              label="Public node UI"
+              v-model="formData.lnbits_public_node_ui"
+            ></q-toggle>
+            <q-toggle
+              v-if="formData.lnbits_node_ui"
+              label="Transactions Tab (Disable on large CLN nodes)"
+              v-model="formData.lnbits_node_ui_transactions"
+            ></q-toggle>
+            <br />
+          </div>
+          <p v-else>Node Management not supported by active funding source</p>
        </div>
      </div>
      <div class="row q-col-gutter-md">
        <div class="col-12 col-md-4">
-          <p>Invoice Expiry</p>
-          <q-input
-            filled
-            v-model.number="formData.lightning_invoice_expiry"
-            type="number"
-            label="Invoice expiry (seconds)"
-            mask="#######"
-          >
-          </q-input>
+          <div class="row">
+            <div class="col-12">
+              <p>Active Funding<small> (Requires server restart)</small></p>
+              <q-select
+                :disable="!isSuperUser"
+                filled
+                v-model="formData.lnbits_backend_wallet_class"
+                hint="Select the active funding wallet"
+                :options="settings.lnbits_allowed_funding_sources"
+              ></q-select>
+            </div>
+          </div>
        </div>
        <div class="col-12 col-md-8">
-          <p>Fee reserve</p>
          <div class="row q-col-gutter-md">
-            <div class="col-6">
+            <div class="col-12 col-md-4">
+              <p>Invoice Expiry</p>
              <q-input
-                type="number"
                filled
-                v-model="formData.lnbits_reserve_fee_min"
-                label="Reserve fee in msats"
+                v-model.number="formData.lightning_invoice_expiry"
+                type="number"
+                label="Invoice expiry (seconds)"
+                mask="#######"
              >
              </q-input>
            </div>
-            <div class="col-6">
-              <q-input
-                type="number"
-                filled
-                name="lnbits_reserve_fee_percent"
-                v-model="formData.lnbits_reserve_fee_percent"
-                label="Reserve fee in percent"
-                step="0.1"
-              ></q-input>
+            <div class="col-12 col-md-8">
+              <p>Fee reserve</p>
+              <div class="row q-col-gutter-md">
+                <div class="col-6">
+                  <q-input
+                    type="number"
+                    filled
+                    v-model="formData.lnbits_reserve_fee_min"
+                    label="Reserve fee in msats"
+                  >
+                  </q-input>
+                </div>
+                <div class="col-6">
+                  <q-input
+                    type="number"
+                    filled
+                    name="lnbits_reserve_fee_percent"
+                    v-model="formData.lnbits_reserve_fee_percent"
+                    label="Reserve fee in percent"
+                    step="0.1"
+                  ></q-input>
+                </div>
+              </div>
            </div>
          </div>
        </div>
      </div>
      <div v-if="isSuperUser">
-        <lnbits-funding-sources
-          :form-data="formData"
-          :allowed-funding-sources="settings.lnbits_allowed_funding_sources"
-        />
+        <p class="q-my-md">
+          Funding Sources<small> (Requires server restart)</small>
+        </p>
+        <q-list
+          v-for="(fund, idx) in settings.lnbits_allowed_funding_sources"
+          :key="idx"
+        >
+          <q-expansion-item
+            expand-separator
+            icon="payments"
+            :label="prettyFunding.get(fund) || fund"
+            v-if="funding_sources.get(fund)"
+          >
+            <q-card>
+              <q-card-section
+                v-for="([key, prop], i) in Object.entries(funding_sources.get(fund))"
+                :key="i"
+              >
+                <q-input
+                  dense
+                  filled
+                  type="text"
+                  v-model="formData[key]"
+                  :label="prop.label"
+                  class="q-pr-md"
+                  :hint="prop.hint"
+                ></q-input>
+              </q-card-section>
+            </q-card>
+          </q-expansion-item>
+        </q-list>
      </div>
    </div>
  </q-card-section>
@@ -1,122 +1,7 @@
 <q-tab-panel name="security">
  <q-card-section class="q-pa-none">
-    <h6 class="q-my-none q-mb-sm">Authentication</h6>
-    <div class="row">
-      <div class="col-md-6 col-sm-12 q-pr-sm">
-        <q-input
-          filled
-          v-model="formData.auth_token_expire_minutes"
-          type="number"
-          label="Token expire minutes"
-          hint="Time in minutes until the token expires"
-        >
-        </q-input>
-      </div>
-      <div class="col-md-6 col-sm-12 q-pr-sm">
-        <q-select
-          filled
-          v-model="formData.auth_allowed_methods"
-          multiple
-          hint="Allowed authorization methods"
-          label="Select authorization methods"
-          :options="formData.auth_all_methods"
-        ></q-select>
-      </div>
-    </div>
-  </q-card-section>
-  <q-card-section
-    v-if="formData.auth_allowed_methods?.includes('google-auth')"
-    class="q-pl-xl"
-  >
-    <strong class="q-my-none q-mb-sm">Google Auth</strong>
-
-    <div class="row">
-      <div class="col-md-6 col-sm-12 q-pr-sm">
-        <q-input
-          filled
-          v-model="formData.google_client_id"
-          label="Google Client ID"
-          hint="Make sure thant the authorized redirect URIs contain https://{domain}/api/v1/auth/google/token"
-        >
-        </q-input>
-      </div>
-      <div class="col-md-6 col-sm-12">
-        <q-input
-          filled
-          v-model="formData.google_client_secret"
-          type="password"
-          label="Google Client Secret"
-        >
-        </q-input>
-      </div>
-    </div>
-  </q-card-section>
-  <q-card-section
-    v-if="formData.auth_allowed_methods?.includes('github-auth')"
-    class="q-pl-xl"
-  >
-    <strong class="q-my-none q-mb-sm">GitHub Auth</strong>
-
-    <div class="row">
-      <div class="col-md-6 col-sm-12 q-pr-sm">
-        <q-input
-          filled
-          v-model="formData.github_client_id"
-          label="GitHub Client ID"
-          hint="Make sure thant the authorization callback URL is set to https://{domain}/api/v1/auth/github/token"
-        >
-        </q-input>
-      </div>
-      <div class="col-md-6 col-sm-12">
-        <q-input
-          filled
-          v-model="formData.github_client_secret"
-          type="password"
-          label="GitHub Client Secret"
-        >
-        </q-input>
-      </div>
-    </div>
-  </q-card-section>
-  <q-card-section
-    v-if="formData.auth_allowed_methods?.includes('keycloak-auth')"
-    class="q-pl-xl"
-  >
-    <strong class="q-my-none q-mb-sm">Keycloak Auth</strong>
-
-    <div class="row">
-      <div class="col-md-4 col-sm-12 q-pr-sm">
-        <q-input
-          filled
-          v-model="formData.keycloak_discovery_url"
-          label="Keycloak Discovey URL"
-        >
-        </q-input>
-      </div>
-      <div class="col-md-4 col-sm-12 q-pr-sm">
-        <q-input
-          filled
-          v-model="formData.keycloak_client_id"
-          label="Keycloak Client ID"
-          hint="Make sure thant the authorization callback URL is set to https://{domain}/api/v1/auth/keycloak/token"
-        >
-        </q-input>
-      </div>
-      <div class="col-md-4 col-sm-12">
-        <q-input
-          filled
-          v-model="formData.keycloak_client_secret"
-          type="password"
-          label="Keycloak Client Secret"
-        >
-        </q-input>
-      </div>
-    </div>
-  </q-card-section>
-  <q-separator></q-separator>
-  <q-card-section class="q-pa-none">
-    <br />
    <h6 class="q-my-none" v-text="$t('security_tools')"></h6>
+    <br />
    <div>
      <div class="row">
        <div v-if="serverlogEnabled" class="column" style="width: 100%">
@@ -131,7 +16,7 @@
              style="padding: 10px; color: #fafafa; height: 320px"
            >
              <small v-for="log in logs"
-                ><span v-text="log"></span><br
+                >{% raw %}{{ log }}{% endraw %}<br
              /></small>
            </q-scroll-area>
          </div>
@@ -166,6 +51,7 @@
                ></q-btn>
              </q-input>
              <div>
+                {%raw%}
                <q-chip
                  v-for="blocked_ip in formData.lnbits_blocked_ips"
                  :key="blocked_ip"
@@ -173,8 +59,10 @@
                  @remove="removeBlockedIPs(blocked_ip)"
                  color="primary"
                  text-color="white"
-                  v-text="blocked_ip"
-                ></q-chip>
+                >
+                  {{ blocked_ip }}
+                </q-chip>
+                {%endraw%}
              </div>
              <br />
            </div>
@@ -195,6 +83,7 @@
                ></q-btn>
              </q-input>
              <div>
+                {%raw%}
                <q-chip
                  v-for="allowed_ip in formData.lnbits_allowed_ips"
                  :key="allowed_ip"
@@ -202,14 +91,15 @@
                  @remove="removeAllowedIPs(allowed_ip)"
                  color="primary"
                  text-color="white"
-                  v-text="allowed_ip"
-                ></q-chip>
+                >
+                  {{ allowed_ip }}
+                </q-chip>
+                {%endraw%}
              </div>
              <br />
            </div>
          </div>
        </div>
-
        <div class="col-12 col-md-12">
          <p v-text="$t('rate_limiter')"></p>
          <div class="row q-col-gutter-md">
@@ -231,36 +121,6 @@
            </div>
          </div>
        </div>
-
-        <div class="col-12 col-md-12">
-          <p v-text="$t('wallet_limiter')"></p>
-          <div class="row q-col-gutter-md">
-            <div class="col-4">
-              <q-input
-                filled
-                type="number"
-                v-model.number="formData.lnbits_wallet_limit_max_balance"
-                :label="$t('wallet_max_ballance')"
-              ></q-input>
-            </div>
-            <div class="col-4">
-              <q-input
-                filled
-                type="number"
-                v-model.number="formData.lnbits_wallet_limit_daily_max_withdraw"
-                :label="$t('wallet_limit_max_withdraw_per_day')"
-              ></q-input>
-            </div>
-            <div class="col-4">
-              <q-input
-                filled
-                type="number"
-                v-model.number="formData.lnbits_wallet_limit_secs_between_trans"
-                :label="$t('wallet_limit_secs_between_trans')"
-              ></q-input>
-            </div>
-          </div>
-        </div>
      </div>
    </div>
    <br />
@@ -1,3 +1,4 @@
+{% raw %}
 <q-banner v-if="updateAvailable" class="bg-primary text-white">
  <q-icon size="28px" name="update"></q-icon>

@@ -7,7 +8,6 @@
      class="q-btn"
      color="white"
      target="_blank"
-      rel="noopener noreferrer"
      href="https://github.com/lnbits/lnbits/releases"
      v-text="$t('releases')"
    ></a>
@@ -29,12 +29,9 @@
      <template v-slot:header="props">
        <q-tr :props="props">
          <q-th auto-width> </q-th>
-          <q-th
-            v-for="col in props.cols"
-            :key="col.name"
-            :props="props"
-            v-text="col.label"
-          ></q-th>
+          <q-th v-for="col in props.cols" :key="col.name" :props="props"
+            >{{ col.label }}</q-th
+          >
        </q-tr>
      </template>
      <template v-slot:body="props">
@@ -53,19 +50,14 @@
              color="red"
            ></q-icon>
          </q-td>
-          <q-td
-            auto-width
-            key="date"
-            :props="props"
-            v-text="formatDate(props.row.date)"
-          >
+          <q-td auto-width key="date" :props="props">
+            {{ formatDate(props.row.date) }}
          </q-td>
          <q-td key="message" :props="props"
-            ><span v-text="props.row.message"></span
-            ><a
+            >{{ props.row.message }}
+            <a
              v-if="props.row.link"
              target="_blank"
-              rel="noopener noreferrer"
              :href="props.row.link"
              v-text="$t('more')"
            ></a
@@ -75,3 +67,4 @@
    </q-table>
  </q-card-section>
 </q-card>
+{% endraw %}
@@ -7,18 +7,53 @@
        <div class="col">
          <p>Server Info</p>
          <ul>
-            <li
-              v-if="settings.lnbits_data_folder"
-              v-text="'SQlite: ' + settings.lnbits_data_folder"
-            ></li>
-            <li
-              v-if="settings.lnbits_database_url"
-              v-text="'Postgres: ' + settings.lnbits_database_url"
-            ></li>
+            {%raw%}
+            <li v-if="settings.lnbits_data_folder">
+              SQlite: {{settings.lnbits_data_folder}}
+            </li>
+            <li v-if="settings.lnbits_database_url">
+              Postgres: {{settings.lnbits_database_url}}
+            </li>
+            {%endraw%}
          </ul>
          <br />
        </div>
      </div>
+      <div class="row q-col-gutter-md">
+        <div class="col-12 col-md-6">
+          <p>Service Fee</p>
+          <q-input
+            filled
+            type="number"
+            v-model.number="formData.lnbits_service_fee"
+            label="Service fee (%)"
+            step="0.1"
+            hint="Fee charged per tx (%)"
+          ></q-input>
+          <br />
+        </div>
+        <div class="col-12 col-md-6">
+          <p>Miscellaneous</p>
+          <q-item tag="label" v-ripple>
+            <q-item-section>
+              <q-item-label>Hide API</q-item-label>
+              <q-item-label caption
+                >Hides wallet api, extensions can choose to honor</q-item-label
+              >
+            </q-item-section>
+            <q-item-section avatar>
+              <q-toggle
+                size="md"
+                v-model="formData.lnbits_hide_api"
+                checked-icon="check"
+                color="green"
+                unchecked-icon="clear"
+              />
+            </q-item-section>
+          </q-item>
+          <br />
+        </div>
+      </div>
      <div class="row q-col-gutter-md">
        <div class="col-12 col-md-6">
          <p>Allowed currencies</p>
@@ -58,104 +93,8 @@
          ></q-select>
          <br />
        </div>
-        <div class="col-12 col-md-6">
-          <p>Miscellaneous</p>
-          <q-item tag="label" v-ripple>
-            <q-item-section>
-              <q-item-label>Disable Extensions</q-item-label>
-              <q-item-label caption>Disables all extensions</q-item-label>
-            </q-item-section>
-            <q-item-section avatar>
-              <q-toggle
-                size="md"
-                v-model="formData.lnbits_extensions_deactivate_all"
-                checked-icon="check"
-                color="green"
-                unchecked-icon="clear"
-              />
-            </q-item-section>
-          </q-item>
-          <q-item tag="label" v-ripple>
-            <q-item-section>
-              <q-item-label>Hide API</q-item-label>
-              <q-item-label caption
-                >Hides wallet api, extensions can choose to honor</q-item-label
-              >
-            </q-item-section>
-            <q-item-section avatar>
-              <q-toggle
-                size="md"
-                v-model="formData.lnbits_hide_api"
-                checked-icon="check"
-                color="green"
-                unchecked-icon="clear"
-              />
-            </q-item-section>
-          </q-item>
-          <br />
-        </div>
-      </div>
-      <br />
-      <h6 class="q-my-none">Service Fee</h6>
-      <div class="row q-col-gutter-md">
-        <div class="col-12 col-md-6">
-          <p>Service Fee</p>
-          <q-input
-            filled
-            type="number"
-            v-model.number="formData.lnbits_service_fee"
-            label="Service fee (%)"
-            step="0.1"
-            hint="Fee charged per tx (%)"
-          ></q-input>
-          <br />
-        </div>
-        <div class="col-12 col-md-6">
-          <p>Service fee max</p>
-          <q-input
-            filled
-            type="number"
-            v-model.number="formData.lnbits_service_fee_max"
-            label="Service fee max (sats)"
-            hint="Max service fee to charge in (sats)"
-          ></q-input>
-          <br />
-        </div>
-        <div class="col-12 col-md-6">
-          <p>Fee Wallet</p>
-          <q-input
-            filled
-            v-model="formData.lnbits_service_fee_wallet"
-            label="Fee wallet (wallet ID)"
-            hint="Wallet ID to send funds to"
-          ></q-input>
-          <br />
-        </div>
-        <div class="col-12 col-md-6">
-          <p>Disable Service Fee for Internal Payments</p>
-          <q-item tag="label" v-ripple>
-            <q-item-section>
-              <q-item-label>Disable Fee</q-item-label>
-              <q-item-label caption
-                >Disable Service Fee for Internal Lightning
-                Payments</q-item-label
-              >
-            </q-item-section>
-            <q-item-section avatar>
-              <q-toggle
-                size="md"
-                v-model="formData.lnbits_service_fee_ignore_internal"
-                checked-icon="check"
-                color="green"
-                unchecked-icon="clear"
-              />
-            </q-item-section>
-          </q-item>
-          <br />
-        </div>
      </div>

-      <h6 class="q-my-none">Extensions</h6>
      <div>
        <p>Extension Sources</p>
        <q-input
@@ -169,6 +108,7 @@
          <q-btn @click="addExtensionsManifest" dense flat icon="add"></q-btn>
        </q-input>
        <div>
+          {%raw%}
          <q-chip
            v-for="manifestUrl in formData.lnbits_extensions_manifests"
            :key="manifestUrl"
@@ -176,8 +116,10 @@
            @remove="removeExtensionsManifest(manifestUrl)"
            color="primary"
            text-color="white"
-            ><span v-text="manifestUrl"></span
-          ></q-chip>
+          >
+            {{ manifestUrl }}
+          </q-chip>
+          {%endraw%}
        </div>
        <br />
      </div>
@@ -36,7 +36,7 @@
      </div>
      <br />
      <div class="row q-col-gutter-md">
-        <div class="col-12 col-md-4">
+        <div class="col-12 col-md-6">
          <p>Default Wallet Name</p>
          <q-input
            filled
@@ -46,7 +46,7 @@
          ></q-input>
          <br />
        </div>
-        <div class="col-12 col-md-4">
+        <div class="col-12 col-md-6">
          <p>Denomination</p>
          <q-input
            filled
@@ -57,17 +57,6 @@
          ></q-input>
          <br />
        </div>
-        <div class="col-12 col-md-4">
-          <p>QR code logo</p>
-          <q-input
-            filled
-            type="text"
-            v-model="formData.lnbits_qr_logo"
-            label="https://example.com/image.svg"
-            hint="URL to logo image in QR code"
-          ></q-input>
-          <br />
-        </div>
      </div>
      <div class="row q-col-gutter-md">
        <div class="col-12 col-md-6">
@@ -1,78 +1,62 @@
 <q-tab-panel name="users">
  <q-card-section class="q-pa-none">
-    <h6 class="q-my-none q-mb-sm">User Management</h6>
-
-    <div class="row">
-      <div class="col-md-6 col-sm-12 q-pr-sm">
-        <p>Admin Users</p>
-        <q-input
-          filled
-          v-model="formAddAdmin"
-          @keydown.enter="addAdminUser"
-          type="text"
-          label="User ID"
-          hint="Users with admin privileges"
+    <h6 class="q-my-none">User Management</h6>
+    <br />
+    <div>
+      <p>Admin Users</p>
+      <q-input
+        filled
+        v-model="formAddAdmin"
+        @keydown.enter="addAdminUser"
+        type="text"
+        label="User ID"
+        hint="Users with admin privileges"
+      >
+        <q-btn @click="addAdminUser" dense flat icon="add"></q-btn>
+      </q-input>
+      <div>
+        {%raw%}
+        <q-chip
+          v-for="user in formData.lnbits_admin_users"
+          :key="user"
+          removable
+          @remove="removeAdminUser(user)"
+          color="primary"
+          text-color="white"
        >
-          <q-btn @click="addAdminUser" dense flat icon="add"></q-btn>
-        </q-input>
-        <div>
-          <q-chip
-            v-for="user in formData.lnbits_admin_users"
-            :key="user"
-            removable
-            @remove="removeAdminUser(user)"
-            color="primary"
-            text-color="white"
-          >
-            <span v-text="user"></span>
-          </q-chip>
-        </div>
-        <br />
+          {{ user }}
+        </q-chip>
+        {%endraw%}
      </div>
-      <div class="col-md-6 col-sm-12">
-        <p>Allowed Users</p>
-        <q-input
-          filled
-          v-model="formAddUser"
-          @keydown.enter="addAllowedUser"
-          type="text"
-          label="User ID"
-          hint="Only these users can use LNbits"
+      <br />
+    </div>
+    <div>
+      <p>Allowed Users</p>
+      <q-input
+        filled
+        v-model="formAddUser"
+        @keydown.enter="addAllowedUser"
+        type="text"
+        label="User ID"
+        hint="Only these users can use LNbits"
+      >
+        <q-btn @click="addAllowedUser" dense flat icon="add"></q-btn>
+      </q-input>
+      <div>
+        {% raw %}
+        <q-chip
+          v-for="user in formData.lnbits_allowed_users"
+          :key="user"
+          removable
+          @remove="removeAllowedUser(user)"
+          color="primary"
+          text-color="white"
        >
-          <q-btn @click="addAllowedUser" dense flat icon="add"></q-btn>
-        </q-input>
-        <div>
-          <q-chip
-            v-for="user in formData.lnbits_allowed_users"
-            :key="user"
-            removable
-            @remove="removeAllowedUser(user)"
-            color="primary"
-            text-color="white"
-          >
-            <span v-text="user" />
-          </q-chip>
-        </div>
-        <br />
-        <q-item tag="label" v-ripple>
-          <q-item-section>
-            <q-item-label>Allow creation of new users</q-item-label>
-            <q-item-label caption
-              >Allow creation of new users on the index page</q-item-label
-            >
-          </q-item-section>
-          <q-item-section avatar>
-            <q-toggle
-              size="md"
-              v-model="formData.lnbits_allow_new_accounts"
-              checked-icon="check"
-              color="green"
-              unchecked-icon="clear"
-            />
-          </q-item-section>
-        </q-item>
-        <br />
+          {{ user }}
+        </q-chip>
+        {% endraw %}
      </div>
+      <br />
    </div>
  </q-card-section>
 </q-tab-panel>
@@ -8,9 +8,9 @@
      @click="updateSettings"
      :disabled="!checkChanges"
    >
-      <q-tooltip v-if="checkChanges">
-        <span v-text="$t('save_tooltip')"></span>
-      </q-tooltip>
+      <q-tooltip v-if="checkChanges"
+        >{%raw%}{{ $t('save_tooltip') }}{%endraw%}</q-tooltip
+      >

      <q-badge
        v-if="checkChanges"
@@ -27,9 +27,9 @@
      color="primary"
      @click="restartServer"
    >
-      <q-tooltip v-if="needsRestart">
-        <span v-text="$t('restart_tooltip')"></span>
-      </q-tooltip>
+      <q-tooltip v-if="needsRestart"
+        >{%raw%}{{ $t('restart_tooltip') }}{%endraw%}</q-tooltip
+      >

      <q-badge
        v-if="needsRestart"
@@ -46,9 +46,7 @@
      color="primary"
      @click="topUpDialog.show = true"
    >
-      <q-tooltip>
-        <span v-text="$t('add_funds_tooltip')"></span>
-      </q-tooltip>
+      <q-tooltip>{%raw%}{{ $t('add_funds_tooltip') }}{%endraw%}</q-tooltip>
    </q-btn>

    <q-btn :label="$t('download_backup')" flat @click="downloadBackup"></q-btn>
@@ -61,9 +59,7 @@
      @click="deleteSettings"
      class="float-right"
    >
-      <q-tooltip>
-        <span v-text="$t('reset_defaults_tooltip')"></span>
-      </q-tooltip>
+      <q-tooltip>{%raw%}{{ $t('reset_defaults_tooltip') }}{%endraw%}</q-tooltip>
    </q-btn>
  </div>
 </div>
@@ -168,5 +164,537 @@
  </q-card>
 </q-dialog>
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
-<script src="{{ static_url_for('static', 'js/admin.js') }}"></script>
+<script>
+  new Vue({
+    el: '#vue',
+    mixins: [windowMixin],
+    data: function () {
+      return {
+        settings: {},
+        logs: [],
+        serverlogEnabled: false,
+        lnbits_theme_options: [
+          'classic',
+          'bitcoin',
+          'flamingo',
+          'cyber',
+          'freedom',
+          'mint',
+          'autumn',
+          'monochrome',
+          'salvador'
+        ],
+        auditData: {},
+        statusData: {},
+        statusDataTable: {
+          columns: [
+            {
+              name: 'date',
+              align: 'left',
+              label: this.$t('date'),
+              field: 'date'
+            },
+            {
+              name: 'message',
+              align: 'left',
+              label: this.$t('memo'),
+              field: 'message'
+            }
+          ]
+        },
+        formData: {},
+        formAddAdmin: '',
+        formAddUser: '',
+        formAddExtensionsManifest: '',
+        formAllowedIPs: '',
+        formBlockedIPs: '',
+        isSuperUser: false,
+        wallet: {},
+        cancel: {},
+        topUpDialog: {
+          show: false
+        },
+        tab: 'funding',
+        needsRestart: false,
+        prettyFunding: new Map([
+          ['VoidWallet', 'Void Wallet'],
+          ['FakeWallet', 'Fake Wallet'],
+          ['CoreLightningWallet', 'Core Lightning'],
+          ['CoreLightningRestWallet', 'Core Lightning'],
+          ['LndRestWallet', 'Lightning Network Daemon (LND Rest)'],
+          ['LndWallet', 'Lightning Network Daemon (LND)'],
+          ['LnTipsWallet', 'LN.Tips'],
+          ['LNPayWallet', 'LN Pay'],
+          ['EclairWallet', 'Eclair (ACINQ)'],
+          ['LNbitsWallet', 'LNBits'],
+          ['OpenNodeWallet', 'OpenNode'],
+          ['ClicheWallet', 'Cliche (NBD)'],
+          ['SparkWallet', 'Spark']
+        ]),
+        funding_sources: new Map([
+          ['VoidWallet', null],
+          [
+            'FakeWallet',
+            {
+              fake_wallet_secret: {
+                value: null,
+                label: 'Secret'
+              }
+            }
+          ],
+          [
+            'CoreLightningWallet',
+            {
+              corelightning_rpc: {
+                value: null,
+                label: 'Endpoint'
+              }
+            }
+          ],
+          [
+            'CoreLightningRestWallet',
+            {
+              corelightning_rest_url: {
+                value: null,
+                label: 'Endpoint'
+              },
+              corelightning_rest_cert: {
+                value: null,
+                label: 'Certificate'
+              },
+              corelightning_rest_macaroon: {
+                value: null,
+                label: 'Macaroon'
+              }
+            }
+          ],
+          [
+            'LndRestWallet',
+            {
+              lnd_rest_endpoint: {
+                value: null,
+                label: 'Endpoint'
+              },
+              lnd_rest_cert: {
+                value: null,
+                label: 'Certificate'
+              },
+              lnd_rest_macaroon: {
+                value: null,
+                label: 'Macaroon'
+              },
+              lnd_rest_macaroon_encrypted: {
+                value: null,
+                label: 'Encrypted Macaroon'
+              }
+            }
+          ],
+          [
+            'LndWallet',
+            {
+              lnd_grpc_endpoint: {
+                value: null,
+                label: 'Endpoint'
+              },
+              lnd_grpc_cert: {
+                value: null,
+                label: 'Certificate'
+              },
+              lnd_grpc_port: {
+                value: null,
+                label: 'Port'
+              },
+              lnd_grpc_admin_macaroon: {
+                value: null,
+                label: 'Admin Macaroon'
+              },
+              lnd_grpc_macaroon_encrypted: {
+                value: null,
+                label: 'Encrypted Macaroon'
+              }
+            }
+          ],
+          [
+            'LnTipsWallet',
+            {
+              lntips_api_endpoint: {
+                value: null,
+                label: 'Endpoint'
+              },
+              lntips_api_key: {
+                value: null,
+                label: 'API Key'
+              }
+            }
+          ],
+          [
+            'LNPayWallet',
+            {
+              lnpay_api_endpoint: {
+                value: null,
+                label: 'Endpoint'
+              },
+              lnpay_api_key: {
+                value: null,
+                label: 'API Key'
+              },
+              lnpay_wallet_key: {
+                value: null,
+                label: 'Wallet Key'
+              }
+            }
+          ],
+          [
+            'EclairWallet',
+            {
+              eclair_url: {
+                value: null,
+                label: 'URL'
+              },
+              eclair_pass: {
+                value: null,
+                label: 'Password'
+              }
+            }
+          ],
+          [
+            'LNbitsWallet',
+            {
+              lnbits_endpoint: {
+                value: null,
+                label: 'Endpoint'
+              },
+              lnbits_key: {
+                value: null,
+                label: 'Admin Key'
+              }
+            }
+          ],
+          [
+            'OpenNodeWallet',
+            {
+              opennode_api_endpoint: {
+                value: null,
+                label: 'Endpoint'
+              },
+              opennode_key: {
+                value: null,
+                label: 'Key'
+              }
+            }
+          ],
+          [
+            'ClicheWallet',
+            {
+              cliche_endpoint: {
+                value: null,
+                label: 'Endpoint'
+              }
+            }
+          ],
+          [
+            'SparkWallet',
+            {
+              spark_url: {
+                value: null,
+                label: 'Endpoint'
+              },
+              spark_token: {
+                value: null,
+                label: 'Token'
+              }
+            }
+          ]
+        ])
+      }
+    },
+    created() {
+      this.getSettings()
+      this.getAudit()
+      this.balance = +'{{ balance|safe }}'
+    },
+    computed: {
+      lnbitsVersion() {
+        return LNBITS_VERSION
+      },
+      checkChanges() {
+        return !_.isEqual(this.settings, this.formData)
+      },
+      updateAvailable() {
+        return LNBITS_VERSION !== this.statusData.version
+      }
+    },
+    methods: {
+      addAdminUser() {
+        let addUser = this.formAddAdmin
+        let admin_users = this.formData.lnbits_admin_users
+        if (addUser && addUser.length && !admin_users.includes(addUser)) {
+          //admin_users = [...admin_users, addUser]
+          this.formData.lnbits_admin_users = [...admin_users, addUser]
+          this.formAddAdmin = ''
+        }
+      },
+      removeAdminUser(user) {
+        let admin_users = this.formData.lnbits_admin_users
+        this.formData.lnbits_admin_users = admin_users.filter(u => u !== user)
+      },
+      addAllowedUser() {
+        let addUser = this.formAddUser
+        let allowed_users = this.formData.lnbits_allowed_users
+        if (addUser && addUser.length && !allowed_users.includes(addUser)) {
+          this.formData.lnbits_allowed_users = [...allowed_users, addUser]
+          this.formAddUser = ''
+        }
+      },
+      removeAllowedUser(user) {
+        let allowed_users = this.formData.lnbits_allowed_users
+        this.formData.lnbits_allowed_users = allowed_users.filter(
+          u => u !== user
+        )
+      },
+      addExtensionsManifest() {
+        const addManifest = this.formAddExtensionsManifest.trim()
+        const manifests = this.formData.lnbits_extensions_manifests
+        if (
+          addManifest &&
+          addManifest.length &&
+          !manifests.includes(addManifest)
+        ) {
+          this.formData.lnbits_extensions_manifests = [
+            ...manifests,
+            addManifest
+          ]
+          this.formAddExtensionsManifest = ''
+        }
+      },
+      removeExtensionsManifest(manifest) {
+        const manifests = this.formData.lnbits_extensions_manifests
+        this.formData.lnbits_extensions_manifests = manifests.filter(
+          m => m !== manifest
+        )
+      },
+      async toggleServerLog() {
+        this.serverlogEnabled = !this.serverlogEnabled
+        if (this.serverlogEnabled) {
+          const wsProto = location.protocol !== 'http:' ? 'wss://' : 'ws://'
+          const digestHex = await LNbits.utils.digestMessage(this.g.user.id)
+          const localUrl =
+            wsProto +
+            document.domain +
+            ':' +
+            location.port +
+            '/api/v1/ws/' +
+            digestHex
+          this.ws = new WebSocket(localUrl)
+          this.ws.addEventListener('message', async ({data}) => {
+            this.logs.push(data.toString())
+            const scrollArea = this.$refs.logScroll
+            if (scrollArea) {
+              const scrollTarget = scrollArea.getScrollTarget()
+              const duration = 0
+              scrollArea.setScrollPosition(scrollTarget.scrollHeight, duration)
+            }
+          })
+        } else {
+          this.ws.close()
+        }
+      },
+      addAllowedIPs() {
+        const allowedIPs = this.formAllowedIPs.trim()
+        const allowed_ips = this.formData.lnbits_allowed_ips
+        if (
+          allowedIPs &&
+          allowedIPs.length &&
+          !allowed_ips.includes(allowedIPs)
+        ) {
+          this.formData.lnbits_allowed_ips = [...allowed_ips, allowedIPs]
+          this.formAllowedIPs = ''
+        }
+      },
+      removeAllowedIPs(allowed_ip) {
+        const allowed_ips = this.formData.lnbits_allowed_ips
+        this.formData.lnbits_allowed_ips = allowed_ips.filter(
+          a => a !== allowed_ip
+        )
+      },
+      addBlockedIPs() {
+        const blockedIPs = this.formBlockedIPs.trim()
+        const blocked_ips = this.formData.lnbits_blocked_ips
+        if (
+          blockedIPs &&
+          blockedIPs.length &&
+          !blocked_ips.includes(blockedIPs)
+        ) {
+          this.formData.lnbits_blocked_ips = [...blocked_ips, blockedIPs]
+          this.formBlockedIPs = ''
+        }
+      },
+      removeBlockedIPs(blocked_ip) {
+        const blocked_ips = this.formData.lnbits_blocked_ips
+        this.formData.lnbits_blocked_ips = blocked_ips.filter(
+          b => b !== blocked_ip
+        )
+      },
+      restartServer() {
+        LNbits.api
+          .request('GET', '/admin/api/v1/restart/?usr=' + this.g.user.id)
+          .then(response => {
+            this.$q.notify({
+              type: 'positive',
+              message: 'Success! Restarted Server',
+              icon: null
+            })
+            this.needsRestart = false
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      topupWallet() {
+        LNbits.api
+          .request(
+            'PUT',
+            '/admin/api/v1/topup/?usr=' + this.g.user.id,
+            this.g.user.wallets[0].adminkey,
+            this.wallet
+          )
+          .then(response => {
+            this.$q.notify({
+              type: 'positive',
+              message:
+                'Success! Added ' +
+                this.wallet.amount +
+                ' to ' +
+                this.wallet.id,
+              icon: null
+            })
+            this.wallet = {}
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      updateFundingData() {
+        this.settings.lnbits_allowed_funding_sources.map(f => {
+          let opts = this.funding_sources.get(f)
+          if (!opts) return
+          Object.keys(opts).forEach(e => {
+            opts[e].value = this.settings[e]
+          })
+        })
+      },
+      formatDate(date) {
+        return moment(date * 1000).fromNow()
+      },
+      getNotifications() {
+        if (this.settings.lnbits_notifications) {
+          axios
+            .get(this.settings.lnbits_status_manifest)
+            .then(response => {
+              this.statusData = response.data
+            })
+            .catch(error => {
+              this.formData.lnbits_notifications = false
+              error.response.data = {}
+              error.response.data.message = 'Could not fetch status manifest.'
+              LNbits.utils.notifyApiError(error)
+            })
+        }
+      },
+      getAudit() {
+        LNbits.api
+          .request(
+            'GET',
+            '/admin/api/v1/audit/?usr=' + this.g.user.id,
+            this.g.user.wallets[0].adminkey
+          )
+          .then(response => {
+            this.auditData = response.data
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      getSettings() {
+        LNbits.api
+          .request(
+            'GET',
+            '/admin/api/v1/settings/?usr=' + this.g.user.id,
+            this.g.user.wallets[0].adminkey
+          )
+          .then(response => {
+            this.isSuperUser = response.data.is_super_user || false
+            this.settings = response.data
+            this.formData = {...this.settings}
+            this.updateFundingData()
+            this.getNotifications()
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      updateSettings() {
+        let data = _.omit(this.formData, [
+          'is_super_user',
+          'lnbits_allowed_funding_sources'
+        ])
+        LNbits.api
+          .request(
+            'PUT',
+            '/admin/api/v1/settings/?usr=' + this.g.user.id,
+            this.g.user.wallets[0].adminkey,
+            data
+          )
+          .then(response => {
+            this.needsRestart =
+              this.settings.lnbits_backend_wallet_class !==
+                this.formData.lnbits_backend_wallet_class ||
+              this.settings.lnbits_killswitch !==
+                this.formData.lnbits_killswitch
+            this.settings = this.formData
+            this.formData = _.clone(this.settings)
+            this.updateFundingData()
+            this.$q.notify({
+              type: 'positive',
+              message: `Success! Settings changed! ${
+                this.needsRestart ? 'Restart required!' : ''
+              }`,
+              icon: null
+            })
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      deleteSettings() {
+        LNbits.utils
+          .confirmDialog(
+            'Are you sure you want to restore settings to default?'
+          )
+          .onOk(() => {
+            LNbits.api
+              .request(
+                'DELETE',
+                '/admin/api/v1/settings/?usr=' + this.g.user.id
+              )
+              .then(response => {
+                this.$q.notify({
+                  type: 'positive',
+                  message:
+                    'Success! Restored settings to defaults, restart required!',
+                  icon: null
+                })
+                this.needsRestart = true
+              })
+              .catch(function (error) {
+                LNbits.utils.notifyApiError(error)
+              })
+          })
+      },
+      downloadBackup() {
+        window.open('/admin/api/v1/backup/?usr=' + this.g.user.id, '_blank')
+      }
+    }
+  })
+</script>
 {% endblock %}
@@ -1,11 +1,10 @@
 <q-expansion-item
  group="extras"
-  icon="vpn_key"
-  :label="$t('api_keys_api_docs')"
+  icon="swap_vertical_circle"
+  :label="$t('api_docs')"
  :content-inset-level="0.5"
 >
  <q-card-section>
-    <strong>Node URL: </strong><em v-text="origin"></em><br />
    <strong>Wallet ID: </strong><em>{{ wallet.id }}</em><br />
    <strong>Admin key: </strong><em>{{ wallet.adminkey }}</em><br />
    <strong>Invoice/read key: </strong><em>{{ wallet.inkey }}</em>
@@ -1,436 +0,0 @@
-{% extends "base.html" %}
-<!---->
-{% from "macros.jinja" import window_vars with context %}
-<!---->
-{% block scripts %} {{ window_vars(user) }}
-<script src="{{ static_url_for('static', 'js/account.js') }}"></script>
-{% endblock %} {% block page %}
-
-<div class="row q-col-gutter-md">
-  <div v-if="user" class="col-12 col-md-6 q-gutter-y-md">
-    <q-card>
-      <q-card-section>
-        <div class="row">
-          <div class="col">
-            <q-tabs v-model="tab" align="justify">
-              <q-tab
-                name="user"
-                :label="$t('account_settings')"
-                @update="val => tab = val.name"
-              ></q-tab>
-              <q-tab
-                name="theme"
-                :label="$t('look_and_feel')"
-                @update="val => tab = val.name"
-              ></q-tab>
-            </q-tabs>
-            <q-tab-panels v-model="tab">
-              <q-tab-panel name="user">
-                <div v-if="passwordData.show">
-                  <q-card-section>
-                    <div class="row">
-                      <div class="col">
-                        <h4 class="q-my-none">
-                          <span v-text="$t('password_config')"></span>
-                        </h4>
-                      </div>
-                      <div class="col">
-                        <q-img
-                          v-if="user.config.picture"
-                          style="max-width: 100px"
-                          :src="user.config.picture"
-                          class="float-right"
-                        ></q-img>
-                      </div>
-                    </div>
-                  </q-card-section>
-                  <q-separator></q-separator>
-                  <q-card-section>
-                    <q-input
-                      v-if="user.has_password"
-                      v-model="passwordData.oldPassword"
-                      type="password"
-                      autocomplete="off"
-                      label="Old Password"
-                      filled
-                      dense
-                      :rules="[(val) => !val || val.length >= 8 || $t('invalid_password')]"
-                    ></q-input>
-                    <q-input
-                      v-model="passwordData.newPassword"
-                      type="password"
-                      autocomplete="off"
-                      :label="$t('password')"
-                      filled
-                      dense
-                      :rules="[(val) => !val || val.length >= 8 || $t('invalid_password')]"
-                    ></q-input>
-                    <q-input
-                      v-model="passwordData.newPasswordRepeat"
-                      type="password"
-                      autocomplete="off"
-                      :label="$t('password_repeat')"
-                      filled
-                      dense
-                      class="q-mb-md"
-                      :rules="[(val) => !val || val.length >= 8 || $t('invalid_password')]"
-                    ></q-input>
-                  </q-card-section>
-                  <q-separator></q-separator>
-                  <q-card-section class="q-pb-lg">
-                    <q-btn
-                      @click="updatePassword"
-                      :disable="(!passwordData.newPassword || !passwordData.newPasswordRepeat) || passwordData.newPassword !== passwordData.newPasswordRepeat"
-                      unelevated
-                      color="primary"
-                      :label="$t('change_password')"
-                    >
-                    </q-btn>
-                    <q-btn
-                      @click="passwordData.show = false"
-                      :label="$t('back')"
-                      outline
-                      unelevated
-                      color="grey"
-                      class="float-right"
-                    ></q-btn>
-                  </q-card-section>
-                </div>
-                <div v-else>
-                  <q-card-section>
-                    <div class="row">
-                      <div class="col">
-                        <q-img
-                          v-if="user.config.picture"
-                          style="max-width: 100px"
-                          :src="user.config.picture"
-                          class="float-right"
-                        ></q-img>
-                      </div>
-                    </div>
-                  </q-card-section>
-                  <q-separator></q-separator>
-
-                  <q-card-section>
-                    <q-input
-                      v-model="user.id"
-                      :label="$t('user_id')"
-                      filled
-                      dense
-                      readonly
-                      :type="showUserId ? 'text': 'password'"
-                      class="q-mb-md"
-                      ><q-btn
-                        @click="showUserId = !showUserId"
-                        dense
-                        flat
-                        :icon="showUserId ? 'visibility_off' : 'visibility'"
-                        color="grey"
-                      ></q-btn>
-                    </q-input>
-                    <q-input
-                      v-model="user.username"
-                      :label="$t('username')"
-                      filled
-                      dense
-                      :readonly="hasUsername"
-                      class="q-mb-md"
-                    >
-                    </q-input>
-                    <q-input
-                      v-model="user.email"
-                      :label="$t('email')"
-                      filled
-                      dense
-                      readonly
-                      class="q-mb-md"
-                    >
-                    </q-input>
-                    <div v-if="!user.email" class="row"></div>
-                    <div v-if="!user.email" class="row">
-                      {% if "google-auth" in LNBITS_AUTH_METHODS or
-                      "github-auth" in LNBITS_AUTH_METHODS %}
-                      <div class="col q-pa-sm text-h6">
-                        <span v-text="$t('verify_email')"></span>:
-                      </div>
-                      {%endif%} {% if "google-auth" in LNBITS_AUTH_METHODS %}
-                      <div class="col q-pa-sm">
-                        <q-btn
-                          :href="`/api/v1/auth/google?user_id=${user.id}`"
-                          type="a"
-                          outline
-                          no-caps
-                          rounded
-                          color="grey"
-                          class="full-width"
-                        >
-                          <q-avatar size="32px" class="q-mr-md">
-                            <q-img
-                              :src="'{{ static_url_for('static', 'images/google-logo.png') }}'"
-                            ></q-img>
-                          </q-avatar>
-                          <div>Google</div>
-                        </q-btn>
-                      </div>
-                      {%endif%} {% if "github-auth" in LNBITS_AUTH_METHODS %}
-                      <div class="col q-pa-sm">
-                        <q-btn
-                          :href="`/api/v1/auth/github?user_id=${user.id}`"
-                          type="a"
-                          outline
-                          no-caps
-                          color="grey"
-                          rounded
-                          class="full-width"
-                        >
-                          <q-avatar size="32px" class="q-mr-md">
-                            <q-img
-                              :src="'{{ static_url_for('static', 'images/github-logo.png') }}'"
-                            ></q-img>
-                          </q-avatar>
-                          <div>GitHub</div>
-                        </q-btn>
-                      </div>
-                      {%endif%}
-                    </div>
-                  </q-card-section>
-
-                  <q-card-section v-if="user.config">
-                    <q-input
-                      v-model="user.config.first_name"
-                      :label="$t('first_name')"
-                      filled
-                      dense
-                      class="q-mb-md"
-                    >
-                    </q-input>
-                    <q-input
-                      v-model="user.config.last_name"
-                      :label="$t('last_name')"
-                      filled
-                      dense
-                      class="q-mb-md"
-                    >
-                    </q-input>
-                    <q-input
-                      v-model="user.config.provider"
-                      :label="$t('auth_provider')"
-                      filled
-                      dense
-                      readonly
-                      class="q-mb-md"
-                    >
-                    </q-input>
-                    <q-input
-                      v-model="user.config.picture"
-                      :label="$t('picture')"
-                      filled
-                      dense
-                      class="q-mb-md"
-                    >
-                    </q-input>
-                  </q-card-section>
-                  <q-separator></q-separator>
-                  <q-card-section>
-                    <q-btn @click="updateAccount" unelevated color="primary">
-                      <span v-text="$t('update_account')"></span>
-                    </q-btn>
-                    <q-btn
-                      @click="showChangePassword()"
-                      :label="user.has_password ? $t('change_password'): $t('set_password')"
-                      outline
-                      unelevated
-                      color="grey"
-                      class="float-right"
-                    ></q-btn>
-                  </q-card-section>
-                </div>
-              </q-tab-panel>
-              <q-tab-panel name="theme">
-                <div class="row q-mb-md">
-                  <div class="col-4"><span v-text="$t('language')"></span></div>
-                  <div class="col-8">
-                    <q-btn-dropdown
-                      dense
-                      flat
-                      round
-                      size="sm"
-                      icon="language"
-                      class="q-pl-md"
-                    >
-                      <q-list v-for="(lang, index) in g.langs" :key="index">
-                        <q-item
-                          clickable
-                          v-close-popup
-                          :active="activeLanguage(lang.value)"
-                          @click="changeLanguage(lang.value)"
-                          ><q-item-section>
-                            <q-item-label
-                              v-text="lang.display ?? lang.value.toUpperCase()"
-                            ></q-item-label>
-                            <q-tooltip
-                              ><span v-text="lang.label"></span
-                            ></q-tooltip>
-                          </q-item-section>
-                        </q-item>
-                      </q-list>
-                    </q-btn-dropdown>
-                  </div>
-                </div>
-                <div class="row q-mb-md">
-                  <div class="col-4">
-                    <span v-text="$t('color_scheme')"></span>
-                  </div>
-                  <div class="col-8">
-                    <q-btn
-                      v-if="g.allowedThemes.includes('classic')"
-                      dense
-                      flat
-                      @click="changeColor('classic')"
-                      icon="circle"
-                      color="deep-purple"
-                      size="md"
-                      ><q-tooltip>classic</q-tooltip>
-                    </q-btn>
-                    <q-btn
-                      v-if="g.allowedThemes.includes('bitcoin')"
-                      dense
-                      flat
-                      @click="changeColor('bitcoin')"
-                      icon="circle"
-                      color="orange"
-                      size="md"
-                      ><q-tooltip>bitcoin</q-tooltip>
-                    </q-btn>
-                    <q-btn
-                      v-if="g.allowedThemes.includes('mint')"
-                      dense
-                      flat
-                      @click="changeColor('mint')"
-                      icon="circle"
-                      color="green"
-                      size="md"
-                      ><q-tooltip>mint</q-tooltip> </q-btn
-                    ><q-btn
-                      v-if="g.allowedThemes.includes('autumn')"
-                      dense
-                      flat
-                      @click="changeColor('autumn')"
-                      icon="circle"
-                      color="brown"
-                      size="md"
-                      ><q-tooltip>autumn</q-tooltip>
-                    </q-btn>
-                    <q-btn
-                      v-if="g.allowedThemes.includes('monochrome')"
-                      dense
-                      flat
-                      @click="changeColor('monochrome')"
-                      icon="circle"
-                      color="grey"
-                      size="md"
-                      ><q-tooltip>monochrome</q-tooltip>
-                    </q-btn>
-                    <q-btn
-                      v-if="g.allowedThemes.includes('salvador')"
-                      dense
-                      flat
-                      @click="changeColor('salvador')"
-                      icon="circle"
-                      color="blue-10"
-                      size="md"
-                      ><q-tooltip>elSalvador</q-tooltip>
-                    </q-btn>
-                    <q-btn
-                      v-if="g.allowedThemes.includes('freedom')"
-                      dense
-                      flat
-                      @click="changeColor('freedom')"
-                      icon="circle"
-                      color="pink-13"
-                      size="md"
-                      ><q-tooltip>freedom</q-tooltip>
-                    </q-btn>
-                    <q-btn
-                      v-if="g.allowedThemes.includes('cyber')"
-                      dense
-                      flat
-                      @click="changeColor('cyber')"
-                      icon="circle"
-                      color="light-green-9"
-                      size="md"
-                      ><q-tooltip>cyber</q-tooltip>
-                    </q-btn>
-                    <q-btn
-                      v-if="g.allowedThemes.includes('flamingo')"
-                      dense
-                      flat
-                      @click="changeColor('flamingo')"
-                      icon="circle"
-                      color="pink-3"
-                      size="md"
-                      ><q-tooltip>flamingo</q-tooltip>
-                    </q-btn>
-                  </div>
-                </div>
-                <div class="row q-mb-md">
-                  <div class="col-4">
-                    <span v-text="$t('toggle_darkmode')"></span>
-                  </div>
-                  <div class="col-8">
-                    <q-btn
-                      dense
-                      flat
-                      round
-                      @click="toggleDarkMode"
-                      :icon="($q.dark.isActive) ? 'brightness_3' : 'wb_sunny'"
-                      size="sm"
-                    >
-                      <q-tooltip
-                        ><span v-text="$t('toggle_darkmode')"></span
-                      ></q-tooltip>
-                    </q-btn>
-                  </div>
-                </div>
-                <div class="row q-mb-md">
-                  <div class="col-4">Notifications</div>
-                  <div class="col-8">
-                    <lnbits-notifications-btn
-                      v-if="g.user"
-                      pubkey="{{ WEBPUSH_PUBKEY }}"
-                    ></lnbits-notifications-btn>
-                  </div>
-                </div>
-                <div class="row q-mb-md">
-                  <div class="col-4">
-                    <span v-text="$t('payment_reactions')"></span>
-                  </div>
-                  <div class="col-8">
-                    <q-select
-                      v-model="reactionChoice"
-                      :options="reactionOptions"
-                      label="Reactions"
-                      @input="reactionChoiceFunc"
-                    >
-                      <q-tooltip
-                        ><span v-text="$t('payment_reactions')"></span
-                      ></q-tooltip>
-                    </q-select>
-                  </div>
-                </div>
-              </q-tab-panel>
-            </q-tab-panels>
-          </div>
-        </div>
-      </q-card-section>
-    </q-card>
-  </div>
-  <div v-else class="col-12 col-md-6 q-gutter-y-md">
-    <q-card>
-      <q-card-section>
-        <h4 class="q-my-none"><span v-text="$t('account')"></span></h4>
-      </q-card-section>
-    </q-card>
-  </div>
-</div>
-{% endblock %}
@@ -2,7 +2,7 @@
 %} {{ window_vars(user, extensions) }}{% block page %}
 <div class="row q-col-gutter-md q-mb-md">
  <div class="col-sm-9 col-xs-12">
-    <p class="text-h4 gt-sm" v-text="$t('extensions')"></p>
+    <p class="text-h4 gt-sm">{%raw%}{{ $t('extensions') }}{%endraw%}</p>
  </div>

  <div class="col-sm-3 col-xs-12 q-ml-auto">
@@ -43,10 +43,9 @@
              :label="$t('featured')"
              @update="val => tab = val.name"
            ></q-tab>
-            <i
-              v-if="!g.user.admin && tab != 'installed'"
-              v-text="$t('only_admins_can_install')"
-            ></i>
+            <i v-if="!g.user.admin && tab != 'installed'"
+              >{%raw%}{{ $t('only_admins_can_install') }}{%endraw%}</i
+            >
          </q-tabs>
        </div>
      </div>
@@ -90,42 +89,45 @@
              color="green"
              class="float-right"
            >
-              <small v-text="$t('new_version')"></small>
+              <small>{%raw%}{{ $t('new_version') }}{%endraw%}</small>
              <q-tooltip
                ><span v-text="extension.latestRelease.version"></span
              ></q-tooltip>
            </q-badge>
-            <div
-              class="text-h5 gt-sm q-mt-sm q-mb-xs gt-sm"
-              v-text="extension.name"
-            ></div>
+            {% raw %}
+            <div class="text-h5 gt-sm q-mt-sm q-mb-xs gt-sm">
+              {{ extension.name }}
+            </div>
            <div
              class="text-h5 gt-sm q-mt-sm q-mb-xs lt-md"
              style="min-height: 60px"
-              v-text="extension.name"
-            ></div>
+            >
+              {{ extension.name }}
+            </div>
            <div
              class="text-subtitle2 gt-sm"
              style="font-size: 11px; height: 34px"
-              v-text="extension.shortDescription || extension.installedRelease?.description"
-            ></div>
-            <div
-              class="text-subtitle1 lt-md q-mt-sm q-mb-xs"
-              v-text="extension.name"
-            ></div>
+            >
+              {{ extension.shortDescription ||
+              extension.installedRelease?.description }}
+            </div>
+            <div class="text-subtitle1 lt-md q-mt-sm q-mb-xs">
+              {{ extension.name }}
+            </div>
            <div
              class="text-subtitle2 lt-md"
              style="font-size: 9px; height: 34px"
-              v-text="extension.shortDescription"
-            ></div>
+            >
+              {{ extension.shortDescription }}
+            </div>
+            {% endraw %}
          </div>
        </div>
        <div class="row q-pt-sm">
          <div class="col">
-            <small
-              v-if="extension.dependencies?.length"
-              v-text="$t('extension_depends_on')"
-            ></small>
+            <small v-if="extension.dependencies?.length"
+              >{%raw%}{{ $t('extension_depends_on') }}{%endraw%}</small
+            >
            <small v-else>&nbsp;</small>
            <q-badge
              v-for="dep in extension.dependencies"
@@ -146,18 +148,20 @@
            size="1.5em"
            :max="5"
            color="primary"
-            ><q-tooltip>
-              <span v-text="$t('extension_rating_soon')"></span> </q-tooltip
-          ></q-rating>
+            ><q-tooltip
+              >{%raw%}{{ $t('extension_rating_soon') }}{%endraw%}</q-tooltip
+            ></q-rating
+          >
          <q-rating
            v-model="maxStars"
            class="lt-md"
            size="1.5em"
            :max="5"
            color="primary"
-            ><q-tooltip>
-              <span v-text="$t('extension_rating_soon')"></span> </q-tooltip
-          ></q-rating>
+            ><q-tooltip
+              >{%raw%}{{ $t('extension_rating_soon') }}{%endraw%}</q-tooltip
+            ></q-rating
+          >
          <q-toggle
            v-if="extension.isAvailable && extension.isInstalled && g.user.admin"
            :label="extension.isActive ? $t('activated'):  $t('deactivated') "
@@ -165,11 +169,11 @@
            style="max-height: 21px"
            v-model="extension.isActive"
            @input="toggleExtension(extension)"
-            ><q-tooltip>
-              <span
-                v-text="$t('activate_extension_details')"
-              ></span> </q-tooltip
-          ></q-toggle>
+            ><q-tooltip
+              >{%raw%}{{ $t('activate_extension_details')
+              }}{%endraw%}</q-tooltip
+            ></q-toggle
+          >
        </div>
      </q-card-section>
      <q-separator></q-separator>
@@ -181,9 +185,9 @@
              flat
              color="primary"
              type="a"
-              :href="extension.id + '/'"
-              :label="$t('open')"
-            ></q-btn>
+              :href="[extension.id, '/?usr=', g.user.id].join('')"
+              >{%raw%}{{ $t('open') }}{%endraw%}</q-btn
+            >
            <q-btn
              v-if="user.extensions.includes(extension.id) && extension.isActive && extension.isInstalled"
              flat
@@ -191,13 +195,12 @@
              type="a"
              :href="['{{
                url_for('install.extensions')
-              }}', '?disable=', extension.id].join('')"
-              :label="$t('disable')"
-            ></q-btn>
-            <q-badge
-              v-if="extension.isAdminOnly && !user.admin"
-              v-text="$t('admin_only')"
+              }}', '?usr=', g.user.id, '&disable=', extension.id].join('')"
            >
+              {%raw%}{{ $t('disable') }}{%endraw%}</q-btn
+            >
+            <q-badge v-if="extension.isAdminOnly && !user.admin">
+              {%raw%}{{ $t('admin_only') }}{%endraw%}
            </q-badge>
            <q-btn
              v-else-if="extension.isInstalled && extension.isActive && !user.extensions.includes(extension.id)"
@@ -206,9 +209,9 @@
              type="a"
              :href="['{{
                url_for('install.extensions')
-              }}', '?enable=', extension.id].join('')"
-              :label="$t('enable')"
+              }}', '?usr=', g.user.id, '&enable=', extension.id].join('')"
            >
+              {%raw%}{{ $t('enable') }}{%endraw%}
              <q-tooltip>
                <span v-text="$t('enable_extension_details')">
                </span> </q-tooltip
@@ -219,11 +222,12 @@
              flat
              color="primary"
              v-if="g.user.admin"
-              :label="$t('manage')"
-              ><q-tooltip
-                ><span v-text="$t('manage_extension_details')"></span
-              ></q-tooltip>
-            </q-btn>
+            >
+              {%raw%}{{ $t('manage') }}{%endraw%}<q-tooltip
+                >{%raw%}{{ $t('manage_extension_details')
+                }}{%endraw%}</q-tooltip
+              ></q-btn
+            >
          </div>
          <div v-else>
            <q-spinner color="primary" size="2.55em"></q-spinner>
@@ -236,10 +240,11 @@
            class="float-right"
          >
            <q-badge>
-              <span v-text="extension.installedRelease.version"></span>
-              <q-tooltip>
-                <span v-text="$t('extension_installed_version')"></span>
-              </q-tooltip>
+              {% raw %}{{ extension.installedRelease.version }}{% endraw
+              %}<q-tooltip
+                >{%raw%}{{ $t('extension_installed_version')
+                }}{%endraw%}</q-tooltip
+              >
            </q-badge>
          </div>
        </div>
@@ -248,10 +253,10 @@
  </div>
  <q-dialog v-model="showUninstallDialog">
    <q-card class="q-pa-lg">
-      <h6 class="q-my-md text-primary" v-text="$t('warning')"></h6>
+      <h6 class="q-my-md text-primary">{%raw%}{{ $t('warning') }}{%endraw%}</h6>
      <p>
-        <span v-text="$t('extension_uninstall_warning')"></span><br />
-        <span v-text="$t('confirm_continue')"></span>
+        {%raw%}{{ $t('extension_uninstall_warning') }}{%endraw%} <br />
+        {%raw%}{{ $t('confirm_continue') }}{%endraw%}
      </p>

      <div class="row q-mt-lg">
@@ -260,39 +265,32 @@
          value="false"
          label="Cleanup database tables"
        >
-          <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left"
-            ><span v-text="$t('extension_db_drop_info')"></span>
+          <q-tooltip class="bg-grey-8" anchor="bottom left" self="top left">
+            {%raw%}{{ $t('extension_db_drop_info') }}{%endraw%}
          </q-tooltip>
        </q-checkbox>
      </div>
      <div class="row q-mt-lg">
-        <q-btn
-          outline
-          color="grey"
-          @click="uninstallExtension()"
-          v-text="$t('uninstall_confirm')"
-        ></q-btn>
-        <q-btn
-          v-close-popup
-          flat
-          color="grey"
-          class="q-ml-auto"
-          v-text="$t('cancel')"
-        ></q-btn>
+        <q-btn outline color="grey" @click="uninstallExtension()"
+          >{%raw%}{{ $t('uninstall_confirm') }}{%endraw%}</q-btn
+        >
+        <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+          >{%raw%}{{ $t('cancel') }}{%endraw%}</q-btn
+        >
      </div>
    </q-card>
  </q-dialog>

  <q-dialog v-model="showDropDbDialog">
    <q-card v-if="selectedExtension" class="q-pa-lg">
-      <h6 class="q-my-md text-primary" v-text="$t('warning')"></h6>
-      <p><span v-text="$t('extension_db_drop_warning')"></span><br /></p>
+      <h6 class="q-my-md text-primary">{%raw%}{{ $t('warning') }}{%endraw%}</h6>
+      <p>{%raw%}{{ $t('extension_db_drop_warning') }}{%endraw%} <br /></p>
      <q-input
        v-model="dropDbExtensionId"
        :label="selectedExtension.id"
      ></q-input>
      <br />
-      <p v-text="$t('confirm_continue')"></p>
+      <p>{%raw%}{{ $t('confirm_continue') }}{%endraw%}</p>

      <div class="row q-mt-lg">
        <q-btn
@@ -300,58 +298,17 @@
          outline
          color="red"
          @click="dropExtensionDb()"
-          v-text="$t('confirm')"
-        ></q-btn>
-        <q-btn
-          v-close-popup
-          flat
-          color="grey"
-          class="q-ml-auto"
-          v-text="$t('cancel')"
-        ></q-btn>
+          >{%raw%}{{ $t('confirm') }}{%endraw%}</q-btn
+        >
+        <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+          >{%raw%}{{ $t('cancel') }}{%endraw%}</q-btn
+        >
      </div>
    </q-card>
  </q-dialog>

  <q-dialog v-model="showUpgradeDialog">
-    <q-card v-if="selectedRelease" class="q-pa-lg lnbits__dialog-card">
-      <q-card-section>
-        <div v-if="selectedRelease.paymentRequest">
-          <a :href="'lightning:' + selectedRelease.paymentRequest">
-            <q-responsive :ratio="1" class="q-mx-xl">
-              <lnbits-qrcode
-                :value="'lightning:' + selectedRelease.paymentRequest.toUpperCase()"
-              ></lnbits-qrcode>
-            </q-responsive>
-          </a>
-        </div>
-        <div v-else>
-          <q-spinner color="primary" size="2.55em"></q-spinner>
-        </div>
-      </q-card-section>
-
-      <div class="row q-mt-lg">
-        <div class="col">
-          <q-btn
-            v-if="selectedRelease.paymentRequest"
-            outline
-            color="grey"
-            @click="copyText(selectedRelease.paymentRequest)"
-            :label="$t('copy_invoice')"
-          ></q-btn>
-        </div>
-        <div class="col">
-          <q-btn
-            v-close-popup
-            flat
-            color="grey"
-            class="float-right q-ml-lg"
-            v-text="$t('close')"
-          ></q-btn>
-        </div>
-      </div>
-    </q-card>
-    <q-card v-else class="q-pa-lg lnbits__dialog-card">
+    <q-card class="q-pa-lg lnbits__dialog-card">
      <q-card-section>
        <div class="text-h6" v-text="selectedExtension?.name"></div>
      </q-card-section>
@@ -381,7 +338,7 @@
              <q-item-section>
                <div class="row">
                  <div class="col-10">
-                    <span v-text="$t('repository')"></span>
+                    {%raw%}{{ $t('repository') }}{%endraw%}
                    <br />
                    <small v-text="repoName"></small>
                    <q-tooltip
@@ -420,116 +377,30 @@
                      color="pink"
                      size="70px"
                    ></q-icon>
-                    <span v-text="$t('release_details_error')"></span>
+                    Cannot get the release details.
                  </div>
                  <q-card v-else>
                    <q-card-section v-if="release.is_version_compatible">
-                      <span
-                        v-if="release.requiresPayment && !release.paid_sats"
-                        v-text="$t('extension_cost', {cost: release.cost_sats})"
-                        class="q-mb-lg"
-                      ></span>
-                      <span
-                        v-if="release.requiresPayment && release.paid_sats"
-                        class="q-mb-lg"
-                        v-text="$t('extension_paid_sats', {paid_sats: release.paid_sats})"
-                      ></span>
-                      <div
-                        v-if="!release.requiresPayment || (release.requiresPayment && release.paid_sats)"
+                      <q-btn
+                        v-if="!release.isInstalled"
+                        @click="installExtension(release)"
+                        color="primary unelevated mt-lg pt-lg"
+                        >{%raw%}{{ $t('install') }}{%endraw%}</q-btn
+                      >
+                      <q-btn v-else @click="showUninstall()" flat color="red">
+                        {%raw%}{{ $t('uninstall') }}{%endraw%}</q-btn
                      >
-                        <q-btn
-                          v-if="!release.isInstalled"
-                          @click="installExtension(release)"
-                          color="primary unelevated mt-lg pt-lg"
-                          :label="$t('install')"
-                        ></q-btn>
-                      </div>
-
-                      <div v-if="release.requiresPayment && !release.paid_sats">
-                        <div v-if="!release.payment_hash">
-                          <q-input
-                            filled
-                            dense
-                            v-model.number="release.paidAmount"
-                            type="number"
-                            :min="release.cost_sats"
-                            suffix="sat"
-                            class="q-mt-sm"
-                          >
-                          </q-input>
-                          <q-select
-                            filled
-                            dense
-                            emit-value
-                            v-model="release.wallet"
-                            :options="g.user.walletOptions"
-                            label="Wallet *"
-                            class="q-mt-sm"
-                          >
-                          </q-select>
-                          <q-btn
-                            unelevated
-                            color="primary"
-                            @click="payAndInstall(release)"
-                            :disabled="!release.wallet"
-                            class="q-mt-sm"
-                            :label="$t('pay_from_wallet')"
-                          ></q-btn>
-
-                          <q-btn
-                            unelevated
-                            color="primary"
-                            @click="showQRCode(release)"
-                            class="q-mt-sm float-right"
-                            :label="$t('show_qr')"
-                          ></q-btn>
-                        </div>
-                        <div v-else>
-                          <br />
-                          <span
-                            class="q-mb-lg q-mt-lg"
-                            v-text="'There is a previous pending invoice for this release.'"
-                          ></span>
-                          <br />
-                          <q-btn
-                            unelevated
-                            @click="installExtension(release)"
-                            color="primary"
-                            class="q-mt-sm"
-                            :label="$t('retry_install')"
-                          ></q-btn>
-                          <q-btn
-                            unelevated
-                            @click="clearHangingInvoice(release)"
-                            color="primary"
-                            class="q-mt-sm float-right"
-                            :label="$t('new_payment')"
-                          ></q-btn>
-                        </div>
-                      </div>
-
-                      <div>
-                        <q-btn
-                          v-if="release.isInstalled"
-                          @click="showUninstall()"
-                          :label="$t('uninstall')"
-                          flat
-                          color="red"
-                        ></q-btn>
-                      </div>
-
                      <a
                        v-if="release.html_url"
                        class="text-secondary float-right"
                        :href="release.html_url"
                        target="_blank"
-                        rel="noopener noreferrer"
                        style="color: inherit"
-                        v-text="$t('release_notes')"
-                      ></a>
+                        >{%raw%}{{ $t('release_notes') }}{%endraw%}</a
+                      >
                    </q-card-section>
                    <q-card-section v-else>
-                      <span v-text="$t('extension_min_lnbits_version')"></span>
+                      {%raw%}{{ $t('extension_min_lnbits_version') }}{%endraw%}
                      <strong>
                        <span v-text="release.min_lnbits_version"></span>
                      </strong>
@@ -537,11 +408,8 @@
                    <q-card v-if="release.warning">
                      <q-card-section>
                        <div class="text-h6">
-                          <q-badge
-                            color="yellow"
-                            text-color="black"
-                            v-text="$t('warning')"
-                          >
+                          <q-badge color="yellow" text-color="black">
+                            {%raw%}{{ $t('warning') }}{%endraw%}
                          </q-badge>
                        </div>
                        <div class="text-subtitle2">
@@ -564,8 +432,9 @@
          @click="showUninstall()"
          flat
          color="red"
-          v-text="$t('uninstall')"
-        ></q-btn>
+        >
+          {%raw%}{{ $t('uninstall') }}{%endraw%}</q-btn
+        >
        <q-btn
          v-else-if="selectedExtension?.hasDatabaseTables"
          @click="showDropDb()"
@@ -573,13 +442,9 @@
          color="red"
          :label="$t('drop_db')"
        ></q-btn>
-        <q-btn
-          v-close-popup
-          flat
-          color="grey"
-          class="q-ml-auto"
-          v-text="$t('close')"
-        ></q-btn>
+        <q-btn v-close-popup flat color="grey" class="q-ml-auto">
+          {%raw%}{{ $t('close') }}{%endraw%}</q-btn
+        >
      </div>
    </q-card>
  </q-dialog>
@@ -599,10 +464,8 @@
        dropDbExtensionId: '',
        selectedExtension: null,
        selectedExtensionRepos: null,
-        selectedRelease: null,
        uninstallAndDropDb: false,
        maxStars: 5,
-        paylinkWebsocket: null,
        user: null
      }
    },
@@ -641,29 +504,19 @@
          .filter(extensionNameContains(term))
        this.tab = tab
      },
-
      installExtension: async function (release) {
-        // no longer required to check if the invoice was paid
-        // the install logic has been triggered one way or another
-        this.unsubscribeFromPaylinkWs()
-
        const extension = this.selectedExtension
        extension.inProgress = true
        this.showUpgradeDialog = false
-        release.payment_hash =
-          release.payment_hash || this.getPaylinkHash(release.pay_link)
-
        LNbits.api
          .request(
            'POST',
-            `/api/v1/extension`,
+            `/api/v1/extension?usr=${this.g.user.id}`,
            this.g.user.wallets[0].adminkey,
            {
              ext_id: extension.id,
              archive: release.archive,
-              source_repo: release.source_repo,
-              payment_hash: release.payment_hash,
-              version: release.version
+              source_repo: release.source_repo
            }
          )
          .then(response => {
@@ -677,9 +530,8 @@
            this.tab = 'installed'
          })
          .catch(err => {
-            console.warn(err)
-            extension.inProgress = false
            LNbits.utils.notifyApiError(err)
+            extension.inProgress = false
          })
      },
      uninstallExtension: async function () {
@@ -690,7 +542,7 @@
        LNbits.api
          .request(
            'DELETE',
-            `/api/v1/extension/${extension.id}`,
+            `/api/v1/extension/${extension.id}?usr=${this.g.user.id}`,
            this.g.user.wallets[0].adminkey
          )
          .then(response => {
@@ -724,7 +576,7 @@
        LNbits.api
          .request(
            'DELETE',
-            `/api/v1/extension/${extension.id}/db`,
+            `/api/v1/extension/${extension.id}/db?usr=${this.g.user.id}`,
            this.g.user.wallets[0].adminkey
          )
          .then(response => {
@@ -746,8 +598,9 @@
        LNbits.api
          .request(
            'GET',
-            "{{ url_for('install.extensions') }}" +
-              '?' +
+            "{{ url_for('install.extensions') }}?usr=" +
+              this.g.user.id +
+              '&' +
              action +
              '=' +
              extension.id
@@ -771,14 +624,12 @@

      showUpgrade: async function (extension) {
        this.selectedExtension = extension
-        this.selectedRelease = null
-        this.selectedExtensionRepos = null
        this.showUpgradeDialog = true
-
+        this.selectedExtensionRepos = null
        try {
          const {data} = await LNbits.api.request(
            'GET',
-            `/api/v1/extension/${extension.id}/releases`,
+            `/api/v1/extension/${extension.id}/releases?usr=${this.g.user.id}`,
            this.g.user.wallets[0].adminkey
          )

@@ -798,12 +649,6 @@
            if (release.isInstalled) {
              repos[release.source_repo].isInstalled = true
            }
-            if (release.pay_link) {
-              release.requiresPayment = true
-              release.paidAmount = release.cost_sats
-              release.payment_hash = this.getPaylinkHash(release.pay_link)
-            }
-
            repos[release.source_repo].releases.push(release)
            return repos
          }, {})
@@ -812,122 +657,6 @@
          extension.inProgress = false
        }
      },
-
-      async payAndInstall(release) {
-        try {
-          this.selectedExtension.inProgress = true
-          this.showUpgradeDialog = false
-          const paymentInfo = await this.requestPayment(
-            this.selectedExtension.id,
-            release
-          )
-          this.rememberPaylinkHash(release.pay_link, paymentInfo.payment_hash)
-          const wallet = this.g.user.wallets.find(w => w.id === release.wallet)
-          const {data} = await LNbits.api.payInvoice(
-            wallet,
-            paymentInfo.payment_request
-          )
-
-          release.payment_hash = data.payment_hash
-
-          await this.installExtension(release)
-        } catch (err) {
-          console.warn(err)
-          LNbits.utils.notifyApiError(err)
-        } finally {
-          this.selectedExtension.inProgress = false
-        }
-      },
-      async showQRCode(release) {
-        this.selectedRelease = release
-
-        try {
-          const data = await this.requestPayment(
-            this.selectedExtension.id,
-            release
-          )
-
-          this.selectedRelease.paymentRequest = data.payment_request
-          this.selectedRelease.payment_hash = data.payment_hash
-          this.selectedRelease = _.clone(this.selectedRelease)
-          this.rememberPaylinkHash(
-            this.selectedRelease.pay_link,
-            this.selectedRelease.payment_hash
-          )
-
-          this.subscribeToPaylinkWs(
-            this.selectedRelease.pay_link,
-            data.payment_hash
-          )
-        } catch (err) {
-          console.warn(err)
-          LNbits.utils.notifyApiError(err)
-        }
-      },
-
-      async requestPayment(extId, release) {
-        const {data} = await LNbits.api.request(
-          'PUT',
-          `/api/v1/extension/invoice`,
-          this.g.user.wallets[0].adminkey,
-          {
-            ext_id: extId,
-            archive: release.archive,
-            source_repo: release.source_repo,
-            cost_sats: release.paidAmount,
-            version: release.version
-          }
-        )
-        return data
-      },
-
-      clearHangingInvoice(release) {
-        this.forgetPaylinkHash(release.pay_link)
-        release.payment_hash = null
-      },
-
-      rememberPaylinkHash(pay_link, payment_hash) {
-        this.$q.localStorage.set(
-          `lnbits.extensions.paylink.${pay_link}`,
-          payment_hash
-        )
-      },
-      getPaylinkHash(pay_link) {
-        return this.$q.localStorage.getItem(
-          `lnbits.extensions.paylink.${pay_link}`
-        )
-      },
-      forgetPaylinkHash(pay_link) {
-        this.$q.localStorage.remove(`lnbits.extensions.paylink.${pay_link}`)
-      },
-      subscribeToPaylinkWs(pay_link, payment_hash) {
-        const url = new URL(`${pay_link}/${payment_hash}`)
-        url.protocol = url.protocol === 'https:' ? 'wss' : 'ws'
-        this.paylinkWebsocket = new WebSocket(url)
-        this.paylinkWebsocket.addEventListener('message', async ({data}) => {
-          const resp = JSON.parse(data)
-          if (resp.paid) {
-            this.$q.notify({
-              type: 'positive',
-              message: 'Invoice Paid!'
-            })
-            this.installExtension(this.selectedRelease)
-          } else {
-            this.$q.notify({
-              type: 'warning',
-              message: 'Invoice tracking lost!'
-            })
-          }
-        })
-      },
-      unsubscribeFromPaylinkWs() {
-        try {
-          this.paylinkWebsocket && this.paylinkWebsocket.close()
-        } catch (error) {
-          console.warn(error)
-        }
-      },
-
      hasNewVersion: function (extension) {
        if (extension.installedRelease && extension.latestRelease) {
          return (
@@ -965,7 +694,7 @@
        try {
          const {data} = await LNbits.api.request(
            'GET',
-            `/api/v1/extension/release/${org}/${repo}/${release.version}`,
+            `/api/v1/extension/release/${org}/${repo}/${release.version}?usr=${this.g.user.id}`,
            this.g.user.wallets[0].adminkey
          )
          release.loaded = true
@@ -1,139 +0,0 @@
-{% extends "public.html" %} {% block page %}
-<div class="row q-col-gutter-md justify-center main">
-  <div class="col-10 col-md-8 col-lg-6 q-gutter-y-md">
-    <q-card>
-      <q-card-section class="grid">
-        <div>
-          <h6 class="q-my-none text-center">
-            <strong>Welcome to LNbits</strong>
-            <p>Set up the Superuser account below.</p>
-          </h6>
-          <br />
-          <q-form class="q-gutter-md">
-            <q-input
-              filled
-              v-model="loginData.username"
-              :label="$t('username')"
-            ></q-input>
-            <q-input
-              filled
-              v-model.trim="loginData.password"
-              :type="loginData.isPwd ? 'password' : 'text'"
-              autocomplete="off"
-              :label="$t('password')"
-              :rules="[(val) => !val || val.length >= 8 || $t('invalid_password')]"
-              ><template v-slot:append>
-                <q-icon
-                  :name="loginData.isPwd ? 'visibility_off' : 'visibility'"
-                  class="cursor-pointer"
-                  @click="loginData.isPwd = !loginData.isPwd"
-                /> </template
-            ></q-input>
-            <q-input
-              filled
-              v-model.trim="loginData.passwordRepeat"
-              :type="loginData.isPwdRepeat ? 'password' : 'text'"
-              autocomplete="off"
-              :label="$t('password_repeat')"
-              :rules="[(val) => !val || val.length >= 8 || $t('invalid_password'), (val) => val === loginData.password || 'Passwords_dont_match']"
-              ><template v-slot:append>
-                <q-icon
-                  :name="loginData.isPwdRepeat ? 'visibility_off' : 'visibility'"
-                  class="cursor-pointer"
-                  @click="loginData.isPwdRepeat = !loginData.isPwdRepeat"
-                /> </template
-            ></q-input>
-            <q-btn
-              @click="setPassword()"
-              unelevated
-              color="primary"
-              :label="$t('login')"
-              :disable="checkPasswordsMatch || !loginData.username || !loginData.password || !loginData.passwordRepeat"
-            ></q-btn>
-          </q-form>
-        </div>
-        <div class="hero-wrapper">
-          <div class="hero q-mx-auto"></div>
-        </div>
-      </q-card-section>
-    </q-card>
-  </div>
-</div>
-{% endblock %} {% block scripts %}
-<style>
-  main {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-  }
-  .grid {
-    display: block;
-  }
-  .hero-wrapper {
-    display: none;
-  }
-  .hero {
-    display: block;
-    height: 100%;
-    max-width: 250px;
-    background-image: url("{{ static_url_for('static', 'images/logos/lnbits.svg') }}");
-    background-position: center;
-    background-size: contain;
-    background-repeat: no-repeat;
-  }
-
-  @media (min-width: 992px) {
-    .grid {
-      display: grid;
-      grid-template-columns: 1fr 1fr;
-      grid-gap: 1rem;
-    }
-    .hero-wrapper {
-      display: block;
-      position: relative;
-      height: 100%;
-      padding: 1rem;
-    }
-  }
-</style>
-<script>
-  new Vue({
-    el: '#vue',
-    mixins: [windowMixin],
-    data: function () {
-      return {
-        loginData: {
-          isPwd: true,
-          isPwdRepeat: true,
-          username: '',
-          password: '',
-          passwordRepeat: ''
-        }
-      }
-    },
-    created() {
-      this.hasAdminUI = '{{ LNBITS_ADMIN_UI | tojson}}'
-    },
-    computed: {
-      checkPasswordsMatch() {
-        return this.loginData.password !== this.loginData.passwordRepeat
-      }
-    },
-    methods: {
-      async setPassword() {
-        try {
-          await LNbits.api.request('PUT', '/api/v1/auth/first_install', null, {
-            username: this.loginData.username,
-            password: this.loginData.password,
-            password_repeat: this.loginData.passwordRepeat
-          })
-
-          window.location.href = '/admin'
-        } catch (e) {
-          LNbits.utils.notifyApiError(e)
-        }
-      }
-    }
-  })
-</script>
-{% endblock %}
@@ -1,343 +1,76 @@
 {% extends "public.html" %} {% block scripts %}
-<script src="{{ static_url_for('static', 'js/index.js') }}"></script>
+<script src="/core/static/js/index.js"></script>
 {% endblock %} {% block page %}
 <div class="row q-col-gutter-md justify-center">
-  <div
-    v-if="isUserAuthorized"
-    class="col-12 col-md-6 col-lg-6 q-gutter-y-md"
-  ></div>
-  <div v-else class="col-12 col-md-4 col-lg-4 q-gutter-y-md">
-    <div class="gt-sm">
-      <h3 class="q-my-none" v-if="'{{SITE_TITLE}}' == 'LNbits'">
-        {{SITE_TITLE}}
-      </h3>
-      <h5 class="q-my-md" v-if="'{{SITE_TITLE}}' == 'LNbits'">
-        {{SITE_TAGLINE}}
-      </h5>
-    </div>
-    {% if lnurl and LNBITS_NEW_ACCOUNTS_ALLOWED and ("user-id-only" in
-    LNBITS_AUTH_METHODS)%}
-    <div class="row q-mt-xl">
-      <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
-        <q-card>
-          <q-card-section>
+  <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
+    <q-card>
+      <q-card-section>
+        {% if lnurl %}
+        <q-btn
+          unelevated
+          color="primary"
+          @click="processing"
+          type="a"
+          href="{{ url_for('core.lnurlwallet') }}?lightning={{ lnurl }}"
+          v-text="$t('press_to_claim')"
+        ></q-btn>
+        {% else %}
+        <q-form @submit="createWallet" class="q-gutter-md">
+          <q-input
+            filled
+            dense
+            v-model="walletName"
+            :label='$t("name_your_wallet", { name: "{{ SITE_TITLE }} *" })'
+          ></q-input>
+          <q-btn
+            unelevated
+            color="primary"
+            :disable="walletName == ''"
+            type="submit"
+            :label="$t('add_wallet')"
+          ></q-btn>
+        </q-form>
+        {% endif %}
+      </q-card-section>
+    </q-card>
+
+    <q-card>
+      <q-card-section>
+        <h3 class="q-my-none">{{SITE_TITLE}}</h3>
+        <h5 class="q-my-md">{{SITE_TAGLINE}}</h5>
+        <div v-if="'{{SITE_TITLE}}' == 'LNbits'">
+          <p v-text="$t('lnbits_description')"></p>
+          <div class="row q-mt-md q-gutter-sm">
            <q-btn
-              unelevated
-              color="primary"
-              @click="processing"
+              outline
+              color="grey"
              type="a"
-              href="{{ url_for('core.lnurlwallet') }}?lightning={{ lnurl }}"
-              v-text="$t('press_to_claim')"
-              class="full-width"
+              href="https://github.com/lnbits/lnbits"
+              target="_blank"
+              rel="noopener"
+              :label="$t('view_github')"
+            ></q-btn>
+            <q-btn
+              outline
+              color="grey"
+              type="a"
+              href="https://legend.lnbits.com/paywall/GAqKguK5S8f6w5VNjS9DfK"
+              target="_blank"
+              rel="noopener"
+              :label="$t('donate')"
            ></q-btn>
-          </q-card-section>
-        </q-card>
-      </div>
-    </div>
-    {%else%} {% endif %}
-
-    <div class="row q-mt-md">
-      <div class="col-12 col-md-10 col-lg-10 q-gutter-y-md">
-        <q-badge v-if="isAccessTokenExpired" color="primary" rounded>
-          <div class="text-h5">
-            <span v-text="$t('session_has_expired')"></span>
          </div>
-        </q-badge>
-        <q-card class="shadow-12">
-          {% if "user-id-only" in LNBITS_AUTH_METHODS %}
-          <q-card-section>
-            <div class="text-h6">
-              <span v-text="$t('instant_access_question')"></span>
-              <br />
-              <q-badge
-                @click="showLogin('user-id-only')"
-                color="primary"
-                class="cursor-pointer"
-                rounded
-              >
-                <strong>
-                  <q-icon name="account_circle" size="xs"></q-icon>
-                  <span v-text="$t('login_with_user_id')"></span> </strong
-              ></q-badge>
-              {% if LNBITS_NEW_ACCOUNTS_ALLOWED %}
-              <span v-text="$t('or')"></span>
-              <q-badge
-                @click="showRegister('user-id-only')"
-                color="primary"
-                class="cursor-pointer"
-                rounded
-              >
-                <strong>
-                  <q-icon name="add" size="xs"></q-icon>
-                  <span v-text="$t('create_new_wallet')"></span>
-                </strong>
-              </q-badge>
-              {%endif%}
-            </div>
-          </q-card-section>
-          <q-separator></q-separator>
-          <q-card-section
-            v-if="authAction === 'login' && authMethod === 'user-id-only'"
-          >
-            <b> <span v-text="$t('login_with_user_id')"></span> </b><br /><br />
-            <q-form @submit="loginUsr" class="q-gutter-md">
-              <q-input
-                filled
-                dense
-                v-model="usr"
-                label="usr"
-                type="password"
-              ></q-input>
-              <div>
-                <q-btn
-                  unelevated
-                  color="primary"
-                  :disable="usr == ''"
-                  type="submit"
-                  label="Login"
-                  class="full-width"
-                ></q-btn>
-              </div>
-            </q-form>
-          </q-card-section>
-          {%endif%} {% if "username-password" in LNBITS_AUTH_METHODS %}
-          <q-card-section
-            v-if="authAction === 'login' && authMethod === 'username-password'"
-          >
-            <div class="q-mb-lg">
-              <strong>
-                <span v-text="$t('login_to_account')"></span>
-              </strong>
-            </div>
-            <q-form @submit="login" class="q-gutter-md">
-              <q-input
-                filled
-                dense
-                v-model="username"
-                name="username"
-                :label="$t('username_or_email') + ' *'"
-              ></q-input>
-              <q-input
-                filled
-                dense
-                v-model="password"
-                name="password"
-                :label="$t('password') + ' *'"
-                type="password"
-              ></q-input>
-              <div>
-                <q-btn
-                  :disable="!username || !password"
-                  color="primary"
-                  type="submit"
-                  :label="$t('login')"
-                  class="full-width"
-                ></q-btn>
-              </div>
-            </q-form>
-          </q-card-section>
-          <q-card-section
-            v-if="authAction === 'register' && authMethod === 'username-password'"
-          >
-            <b> <span v-text="$t('create_account')"></span> </b><br /><br />
-            <q-form @submit="register" class="q-gutter-md">
-              <q-input
-                filled
-                dense
-                required
-                v-model="username"
-                :label="$t('username') + ' *'"
-                :rules="[(val) => validateUsername(val) || $t('invalid_username')]"
-              ></q-input>
-              <q-input
-                filled
-                dense
-                v-model="password"
-                :label="$t('password') + ' *'"
-                type="password"
-                :rules="[(val) => !val || val.length >= 8 || $t('invalid_password')]"
-              ></q-input>
-              <q-input
-                filled
-                dense
-                v-model="passwordRepeat"
-                :label="$t('password_repeat') + ' *'"
-                type="password"
-                :rules="[(val) => !val || val.length >= 8 || $t('invalid_password')]"
-              ></q-input>
-              <div>
-                <q-btn
-                  unelevated
-                  color="primary"
-                  :disable="!password || !passwordRepeat|| !username || (password !== passwordRepeat)"
-                  type="submit"
-                  class="full-width"
-                  :label="$t('create_account')"
-                ></q-btn>
-              </div>
-            </q-form>
-          </q-card-section>
-          {%endif%} {% if LNBITS_NEW_ACCOUNTS_ALLOWED %}
-          <q-card-section
-            v-if="authAction === 'register' && authMethod === 'user-id-only'"
-          >
-            <div>
-              <q-form @submit="createWallet" class="q-gutter-md">
-                <q-input
-                  filled
-                  dense
-                  v-model="walletName"
-                  :label='$t("name_your_wallet", { name: "{{ SITE_TITLE }} *" })'
-                ></q-input>
-                <div>
-                  <q-btn
-                    color="primary"
-                    :disable="walletName == ''"
-                    type="submit"
-                    :label="$t('add_wallet')"
-                    class="full-width"
-                  ></q-btn>
-                </div>
-              </q-form>
-            </div>
-          </q-card-section>
-          {% if "username-password" in LNBITS_AUTH_METHODS %}
-          <q-card-section
-            v-if="authAction === 'login' && authMethod === 'username-password'"
-          >
-            <div>
-              <q-btn
-                color="grey"
-                outline
-                :label="$t('register')"
-                class="full-width"
-                @click="showRegister('username-password')"
-              ></q-btn>
-            </div>
-          </q-card-section>
-          {%endif%}
-          <q-separator></q-separator>
-          {% endif %}
-
-          <q-card-section
-            v-if="authAction === 'login' && authMethod === 'username-password'"
-          >
-            <div class="row">
-              {% if "google-auth" in LNBITS_AUTH_METHODS %}
-              <div class="col-12 full-width q-pa-sm">
-                <q-btn
-                  href="/api/v1/auth/google"
-                  type="a"
-                  outline
-                  no-caps
-                  rounded
-                  color="grey"
-                  class="full-width"
-                >
-                  <q-avatar size="32px" class="q-mr-md">
-                    <q-img
-                      :src="'{{ static_url_for('static', 'images/google-logo.png') }}'"
-                    ></q-img>
-                  </q-avatar>
-                  <div>
-                    <span v-text="$t('signin_with_google')"></span>
-                  </div>
-                </q-btn>
-              </div>
-              {%endif%} {% if "github-auth" in LNBITS_AUTH_METHODS %}
-              <div class="col-12 full-width q-pa-sm">
-                <q-btn
-                  href="/api/v1/auth/github"
-                  type="a"
-                  outline
-                  no-caps
-                  color="grey"
-                  rounded
-                  class="full-width"
-                >
-                  <q-avatar size="32px" class="q-mr-md">
-                    <q-img
-                      :src="'{{ static_url_for('static', 'images/github-logo.png') }}'"
-                    ></q-img>
-                  </q-avatar>
-                  <div><span v-text="$t('signin_with_github')"></span></div>
-                </q-btn>
-              </div>
-              {%endif%} {% if "keycloak-auth" in LNBITS_AUTH_METHODS %}
-              <div class="col-12 full-width q-pa-sm">
-                <q-btn
-                  href="/api/v1/auth/keycloak"
-                  type="a"
-                  outline
-                  no-caps
-                  color="grey"
-                  rounded
-                  class="full-width"
-                >
-                  <q-avatar size="32px" class="q-mr-md">
-                    <q-img
-                      :src="'{{ static_url_for('static', 'images/keycloak-logo.png') }}'"
-                    ></q-img>
-                  </q-avatar>
-                  <div><span v-text="$t('signin_with_keycloak')"></span></div>
-                </q-btn>
-              </div>
-              {%endif%}
-            </div>
-          </q-card-section>
-          <q-card-section v-else>
-            <div class="row">
-              <div class="col q-pa-sm">
-                <q-btn
-                  @click="showLogin('username-password')"
-                  :label="$t('back')"
-                  outline
-                  rounded
-                  color="grey"
-                  class="full-width"
-                >
-                </q-btn>
-              </div>
-            </div>
-          </q-card-section>
-        </q-card>
-      </div>
-    </div>
+        </div>
+        <div v-else>
+          <div v-html="formatDescription"></div>
+        </div>
+      </q-card-section>
+    </q-card>
  </div>

-  <div
-    v-if="'{{SITE_TITLE}}' != 'LNbits'"
-    class="col-12 col-md-5 col-lg-5 q-pt-xl"
-  >
-    <h3 class="q-my-none">{{SITE_TITLE}}</h3>
-    <h5 class="q-my-md">{{SITE_TAGLINE}}</h5>
-    <div v-html="formatDescription"></div>
-  </div>
-
-  <div class="col-12 col-md-3 col-lg-3 gt-sm" v-else>
+  <!-- Ads -->
+  <div class="col-12 col-md-3 col-lg-3" v-if="'{{SITE_TITLE}}' == 'LNbits'">
    <div class="row q-col-gutter-lg justify-center">
-      <div class="col-6 col-sm-4 col-md-8 q-gutter-y-sm">
-        <q-btn
-          outline
-          color="grey"
-          type="a"
-          href="https://github.com/lnbits/lnbits"
-          target="_blank"
-          rel="noopener noreferrer"
-          :label="$t('view_github')"
-          class="full-width"
-        ></q-btn>
-        <q-btn
-          outline
-          color="grey"
-          type="a"
-          href="https://legend.lnbits.com/paywall/GAqKguK5S8f6w5VNjS9DfK"
-          target="_blank"
-          rel="noopener noreferrer"
-          :label="$t('donate')"
-          class="full-width q-mb-lg"
-        ></q-btn>
-      </div>
      <div class="col-6 col-sm-4 col-md-8 q-gutter-y-sm">
        <q-btn
          flat
@@ -347,26 +80,18 @@
        ></q-btn>
        <div class="row">
          <div class="col">
-            <a
-              href="https://github.com/ElementsProject/lightning"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
+            <a href="https://github.com/ElementsProject/lightning">
              <q-img
                contain
-                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/cln.png') }}' : '{{ static_url_for('static', 'images/clnl.png') }}'"
+                :src="($q.dark.isActive) ? '/static/images/cln.png' : '/static/images/clnl.png'"
              ></q-img>
            </a>
          </div>
          <div class="col q-pl-md">
-            <a
-              href="https://github.com/lightningnetwork/lnd"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
+            <a href="https://github.com/lightningnetwork/lnd">
              <q-img
                contain
-                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/lnd.png') }}' : '{{ static_url_for('static', 'images/lnd.png') }}'"
+                :src="($q.dark.isActive) ? '/static/images/lnd.png' : '/static/images/lnd.png'"
              ></q-img>
            </a>
          </div>
@@ -374,26 +99,18 @@

        <div class="row">
          <div class="col">
-            <a
-              href="https://opennode.com"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
+            <a href="https://opennode.com">
              <q-img
                contain
-                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/opennode.png') }}' : '{{ static_url_for('static', 'images/opennodel.png') }}'"
+                :src="($q.dark.isActive) ? '/static/images/opennode.png' : '/static/images/opennodel.png'"
              ></q-img>
            </a>
          </div>
          <div class="col q-pl-md">
-            <a
-              href="https://lnpay.co/"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
+            <a href="https://lnpay.co/">
              <q-img
                contain
-                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/lnpay.png') }}' : '{{ static_url_for('static', 'images/lnpayl.png') }}'"
+                :src="($q.dark.isActive) ? '/static/images/lnpay.png' : '/static/images/lnpayl.png'"
              ></q-img>
            </a>
          </div>
@@ -401,125 +118,77 @@

        <div class="row">
          <div class="col">
-            <a
-              href="https://github.com/rootzoll/raspiblitz"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
+            <a href="https://github.com/rootzoll/raspiblitz">
              <q-img
                contain
-                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/blitz.png') }}' : '{{ static_url_for('static', 'images/blitzl.png') }}'"
+                :src="($q.dark.isActive) ? '/static/images/blitz.png' : '/static/images/blitzl.png'"
              ></q-img>
            </a>
          </div>
          <div class="col q-pl-md">
-            <a
-              href="https://start9.com/"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
+            <a href="https://start9.com/">
              <q-img
                contain
-                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/start9.png') }}' : '{{ static_url_for('static', 'images/start9l.png') }}'"
+                :src="($q.dark.isActive) ? '/static/images/start9.png' : '/static/images/start9l.png'"
              ></q-img>
            </a>
          </div>
        </div>
        <div class="row">
          <div class="col">
-            <a
-              href="https://getumbrel.com/"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
+            <a href="https://getumbrel.com/">
              <q-img
                contain
-                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/umbrel.png') }}' : '{{ static_url_for('static', 'images/umbrell.png') }}'"
+                :src="($q.dark.isActive) ? '/static/images/umbrel.png' : '/static/images/umbrell.png'"
              ></q-img>
            </a>
          </div>
          <div class="col q-pl-md">
-            <a
-              href="https://mynodebtc.com"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
+            <a href="https://mynodebtc.com">
              <q-img
                contain
-                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/mynode.png') }}' : '{{ static_url_for('static', 'images/mynodel.png') }}'"
+                :src="($q.dark.isActive) ? '/static/images/mynode.png' : '/static/images/mynodel.png'"
              ></q-img>
            </a>
          </div>
        </div>
        <div class="row">
          <div class="col">
-            <a
-              href="https://github.com/shesek/spark-wallet"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
+            <a href="https://github.com/shesek/spark-wallet">
              <q-img
                contain
-                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/spark.png') }}' : '{{ static_url_for('static', 'images/sparkl.png') }}'"
+                :src="($q.dark.isActive) ? '/static/images/spark.png' : '/static/images/sparkl.png'"
              ></q-img>
            </a>
          </div>
          <div class="col q-pl-md">
-            <a
-              href="https://voltage.cloud"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
+            <a href="https://voltage.cloud">
              <q-img
                contain
-                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/voltage.png') }}' : '{{ static_url_for('static', 'images/voltagel.png') }}'"
-              ></q-img>
-            </a>
-          </div>
-        </div>
-        <div class="row">
-          <div class="col">
-            <a
-              href="https://getalby.com"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              <q-img
-                contain
-                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/alby.png') }}' : '{{ static_url_for('static', 'images/albyl.png') }}'"
-              ></q-img>
-            </a>
-          </div>
-          <div class="col q-pl-md">
-            <a href="https://zbd.gg" target="_blank" rel="noopener noreferrer">
-              <q-img
-                contain
-                :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/zbd.png') }}' : '{{ static_url_for('static', 'images/zbdl.png') }}'"
+                :src="($q.dark.isActive) ? '/static/images/voltage.png' : '/static/images/voltagel.png'"
              ></q-img>
            </a>
          </div>
        </div>
      </div>
+
+      {% if AD_SPACE %} {% for ADS in AD_SPACE %} {% set AD = ADS.split(';') %}
+      <div class="col-6 col-sm-4 col-md-8 q-gutter-y-sm">
+        <q-btn flat color="secondary" class="full-width q-mb-md"
+          >{{ AD_TITLE }}</q-btn
+        >
+
+        <a href="{{ AD[0] }}" class="q-ma-md">
+          <img
+            v-if="($q.dark.isActive)"
+            src="{{ AD[1] }}"
+            style="max-width: 90%"
+          />
+          <img v-else src="{{ AD[2] }}" style="max-width: 90%" />
+        </a>
+      </div>
+      {% endfor %} {% endif %}
    </div>
  </div>
-  {% if AD_SPACE %} {% for ADS in AD_SPACE %} {% set AD = ADS.split(';') %}
-  <div class="col-6 col-sm-4 col-md-8 q-gutter-y-sm">
-    <q-btn flat color="secondary" class="full-width q-mb-md"
-      >{{ AD_SPACE_TITLE }}</q-btn
-    >
-
-    <a href="{{ AD[0] }}" class="q-ma-md">
-      <img v-if="($q.dark.isActive)" src="{{ AD[1] }}" style="max-width: 90%" />
-      <img v-else src="{{ AD[2] }}" style="max-width: 90%" />
-    </a>
-  </div>
-  {% endfor %} {% endif %}
-</div>
-<div v-if="'{{SITE_TITLE}}' == 'LNbits'" class="row gt-sm q-mt-xl">
-  <div class="col-1"></div>
-  <div class="col-10 q-pl-xl">
-    <span v-text="$t('lnbits_description')"></span>
-  </div>
-  <div class="col-1"></div>
 </div>
 {% endblock %}
@@ -3,7 +3,7 @@
 {% from "macros.jinja" import window_vars with context %}
 <!---->
 {% block scripts %} {{ window_vars(user, wallet) }}
-<script src="{{ static_url_for('static', 'js/wallet.js') }}"></script>
+<script src="/core/static/js/wallet.js"></script>
 {% endblock %}
 <!---->
 {% block title %} {{ wallet.name }} - {{ SITE_TITLE }} {% endblock %}
@@ -15,58 +15,46 @@
    {% elif HIDE_API %}
    <div class="col-12 q-gutter-y-md">
      {% else %}
-      <div
-        class="col-12 col-md-7 q-gutter-y-md"
-        :style="$q.screen.lt.md ? {
-        position: mobileSimple ? 'fixed !important': ''
-      , top: mobileSimple ? '50% !important': ''
-      , left: mobileSimple ? '50% !important': ''
-      , transform: mobileSimple ? 'translate(-50%, -50%) !important': ''
-    } : ''"
-      >
+      <div class="col-12 col-md-7 q-gutter-y-md">
        {% endif %}
-        <q-card
-          :style="$q.screen.lt.md ? {
-            background: $q.screen.lt.md ? 'none !important': ''
-          , boxShadow: $q.screen.lt.md ? 'none !important': ''
-          , margin: $q.screen.lt.md && mobileSimple ? 'auto !important': ''
-          , width: $q.screen.lt.md && mobileSimple ? '90% !important': ''
-        } : ''"
-        >
+        <q-card>
          <q-card-section>
-            <h3 class="q-my-none text-no-wrap">
-              <strong v-text="formattedBalance"></strong>
-              <small>{{LNBITS_DENOMINATION}}</small>
-              <lnbits-update-balance
+            <h3 class="q-my-none">
+              <strong>{% raw %}{{ formattedBalance }} {% endraw %}</strong>
+              {{LNBITS_DENOMINATION}}
+              <q-btn
                v-if="'{{user.super_user}}' == 'True'"
-                :wallet_id="this.g.wallet.id"
                flat
-                :callback="updateBalanceCallback"
                round
-              />
+                color="primary"
+                icon="add"
+                size="md"
+              >
+                <q-popup-edit
+                  class="bg-accent text-white"
+                  v-slot="scope"
+                  v-model="credit"
+                >
+                  <q-input
+                    filled
+                    :label='$t("credit_label", { denomination: "{{LNBITS_DENOMINATION}}"})'
+                    :hint="$t('credit_hint')"
+                    v-model="scope.value"
+                    dense
+                    autofocus
+                    :mask="'{{LNBITS_DENOMINATION}}' != 'sats' ? '#.##' : '#'"
+                    fill-mask="0"
+                    reverse-fill-mask
+                    :step="'{{LNBITS_DENOMINATION}}' != 'sats' ? '0.01' : '1'"
+                    @keyup.enter="updateBalance(scope.value)"
+                  >
+                    <template v-slot:append>
+                      <q-icon name="edit" />
+                    </template>
+                  </q-input>
+                </q-popup-edit>
+              </q-btn>
            </h3>
-            <div class="row">
-              <div class="col">
-                <div v-if="g.wallet.currency">
-                  <span
-                    class="text-h5 text-italic"
-                    v-text="formattedFiatBalance"
-                    style="opacity: 0.75"
-                  ></span>
-                </div>
-              </div>
-              <div class="col">
-                <q-btn
-                  @click="mobileSimple = !mobileSimple"
-                  color="primary"
-                  class="float-right lt-md"
-                  size="sm"
-                  flat
-                  :icon="mobileSimple ? 'unfold_more' : 'unfold_less'"
-                  :label="mobileSimple ? $t('more') : $t('less')"
-                ></q-btn>
-              </div>
-            </div>
          </q-card-section>
          <div class="row q-pb-md q-px-md q-col-gutter-md gt-sm">
            <div class="col">
@@ -96,20 +84,14 @@
                :label="$t('scan')"
              >
                <q-tooltip
-                  ><span v-text="$t('camera_tooltip')"></span
-                ></q-tooltip>
+                  >{% raw %}{{$t('camera_tooltip')}}{% endraw %}</q-tooltip
+                >
              </q-btn>
            </div>
          </div>
        </q-card>

-        <q-card
-          :style="$q.screen.lt.md ? {
-            background: $q.screen.lt.md ? 'none !important': ''
-            , boxShadow: $q.screen.lt.md ? 'none !important': ''
-            , marginTop: $q.screen.lt.md ? '0px !important': ''
-          } : ''"
-        >
+        <q-card>
          <q-card-section>
            <div class="row items-center no-wrap q-mb-sm">
              <div class="col">
@@ -118,13 +100,16 @@
                  :v-text="$t('transactions')"
                ></h5>
              </div>
-              <div class="gt-sm col-auto">
+              <div class="col-auto">
                <q-btn
                  flat
                  color="grey"
                  @click="exportCSV"
                  :label="$t('export_csv')"
                ></q-btn>
+                <!--<q-btn v-if="pendingPaymentsExist" dense flat round icon="update" color="grey" @click="checkPendingPayments">
+                <q-tooltip>Check pending</q-tooltip>
+              </q-btn>-->
                <q-btn
                  dense
                  flat
@@ -133,20 +118,17 @@
                  color="grey"
                  @click="showChart"
                >
-                  <q-tooltip>
-                    <span v-text="$t('chart_tooltip')"></span
-                  ></q-tooltip>
+                  <q-tooltip
+                    >{% raw %}{{$t('chart_tooltip')}}{% endraw %}</q-tooltip
+                  >
                </q-btn>
              </div>
            </div>
            <q-input
-              :style="$q.screen.lt.md ? {
-              display: mobileSimple ? 'none !important': ''
-            } : ''"
              filled
              dense
              clearable
-              v-model="paymentsTable.search"
+              v-model="paymentsTable.filter"
              debounce="300"
              :placeholder="$t('search_by_tag_memo_amount')"
              class="q-mb-md"
@@ -155,26 +137,22 @@
            <q-table
              dense
              flat
-              :data="paymentsOmitter"
+              :data="payments"
              :row-key="paymentTableRowKey"
              :columns="paymentsTable.columns"
              :pagination.sync="paymentsTable.pagination"
              :no-data-label="$t('no_transactions')"
-              :filter="paymentsTable.search"
+              :filter="paymentsTable.filter"
              :loading="paymentsTable.loading"
-              :hide-header="mobileSimple"
-              :hide-bottom="mobileSimple"
              @request="fetchPayments"
            >
+              {% raw %}
              <template v-slot:header="props">
                <q-tr :props="props">
                  <q-th auto-width></q-th>
-                  <q-th
-                    v-for="col in props.cols"
-                    :key="col.name"
-                    :props="props"
-                    v-text="col.label"
-                  ></q-th>
+                  <q-th v-for="col in props.cols" :key="col.name" :props="props"
+                    >{{ col.label }}</q-th
+                  >
                </q-tr>
              </template>
              <template v-slot:body="props">
@@ -193,9 +171,7 @@
                      color="grey"
                      @click="props.expand = !props.expand"
                    >
-                      <q-tooltip
-                        ><span v-text="$t('pending')"></span
-                      ></q-tooltip>
+                      <q-tooltip>{{$t('pending')}}</q-tooltip>
                    </q-icon>
                  </q-td>
                  <q-td
@@ -209,47 +185,47 @@
                      text-color="black"
                    >
                      <a
-                        v-text="'#'+props.row.tag"
                        class="inherit"
-                        :href="['/', props.row.tag].join('')"
-                      ></a>
+                        :href="['/', props.row.tag, '/?usr=', user.id].join('')"
+                      >
+                        #{{ props.row.tag }}
+                      </a>
                    </q-badge>
-                    <span v-text="props.row.memo"></span>
+                    {{ props.row.memo }}
                    <br />

                    <i>
-                      <span v-text="props.row.dateFrom"></span>
-                      <q-tooltip
-                        ><span v-text="props.row.date"></span
-                      ></q-tooltip>
-                    </i>
+                      {{ props.row.dateFrom }}<q-tooltip
+                        >{{ props.row.date }}</q-tooltip
+                      ></i
+                    >
                  </q-td>
+
+                  {% endraw %}
                  <q-td
                    auto-width
                    key="amount"
                    v-if="'{{LNBITS_DENOMINATION}}' != 'sats'"
                    :props="props"
-                    v-text="parseFloat(String(props.row.fsat).replaceAll(',', '')) / 100"
-                  >
+                    >{% raw %} {{
+                    parseFloat(String(props.row.fsat).replaceAll(",", "")) / 100
+                    }}
                  </q-td>
                  <q-td auto-width key="amount" v-else :props="props">
-                    <span v-text="props.row.fsat"></span>
-                    <br />
+                    {{ props.row.fsat }}<br />
                    <i v-if="props.row.extra.wallet_fiat_currency">
-                      <span
-                        v-text="formatFiat(props.row.extra.wallet_fiat_currency, props.row.extra.wallet_fiat_amount)"
-                      ></span>
+                      {{ props.row.extra.wallet_fiat_currency }} {{
+                      props.row.extra.wallet_fiat_amount }}
                      <br />
                    </i>
                    <i v-if="props.row.extra.fiat_currency">
-                      <span
-                        v-text="formatFiat(props.row.extra.fiat_currency, props.row.extra.fiat_amount)"
-                      ></span>
+                      {{ props.row.extra.fiat_currency }} {{
+                      props.row.extra.fiat_amount }}
                    </i>
                  </q-td>
                </q-tr>

-                <q-dialog v-model="props.expand" :props="props" position="top">
+                <q-dialog v-model="props.expand" :props="props">
                  <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
                    <div class="text-center q-mb-lg">
                      <div v-if="props.row.isIn && props.row.pending">
@@ -264,9 +240,11 @@
                        >
                          <a :href="'lightning:' + props.row.bolt11">
                            <q-responsive :ratio="1" class="q-mx-xl">
-                              <lnbits-qrcode
+                              <qrcode
                                :value="'lightning:' + props.row.bolt11.toUpperCase()"
-                              ></lnbits-qrcode>
+                                :options="{width: 340}"
+                                class="rounded-borders"
+                              ></qrcode>
                            </q-responsive>
                          </a>
                        </div>
@@ -319,28 +297,30 @@
                  </q-card>
                </q-dialog>
              </template>
+              {% endraw %}
            </q-table>
          </q-card-section>
        </q-card>
      </div>
+
      {% if HIDE_API %}
      <div class="col-12 col-md-4 q-gutter-y-md">
        {% else %}
-        <div
-          v-if="!mobileSimple || $q.screen.gt.sm"
-          class="col-12 col-md-5 q-gutter-y-md"
-        >
+        <div class="col-12 col-md-5 q-gutter-y-md">
          <q-card>
            <q-card-section>
              <h6 class="text-subtitle1 q-mt-none q-mb-sm">
                {{ SITE_TITLE }} Wallet:
-                <strong><em>{{wallet.name}}</em></strong>
+                <strong><em>{{ wallet.name }}</em></strong>
              </h6>
            </q-card-section>
            <q-card-section class="q-pa-none">
              <q-separator></q-separator>

              <q-list>
+                {% include "core/_api_docs.html" %}
+                <q-separator></q-separator>
+
                {% if wallet.lnurlwithdraw_full %}
                <q-expansion-item
                  group="extras"
@@ -350,9 +330,10 @@
                  <q-card>
                    <q-card-section class="text-center">
                      <a href="lightning:{{wallet.lnurlwithdraw_full}}">
-                        <lnbits-qrcode
-                          :value="lightning:{{wallet.lnurlwithdraw_full}}"
-                        ></lnbits-qrcode>
+                        <qrcode
+                          value="lightning:{{wallet.lnurlwithdraw_full}}"
+                          :options="{width:240}"
+                        ></qrcode>
                      </a>
                      <p v-text="$t('drain_funds_desc')"></p>
                    </q-card-section>
@@ -370,7 +351,7 @@
                    <q-card-section class="text-center">
                      <p v-text="$t('export_to_phone_desc')"></p>
                      <qrcode
-                        :value="'{{request.base_url}}wallet?usr={{user.id}}&wal={{wallet.id}}'"
+                        :value="'{{request.base_url}}' +'wallet?usr={{user.id}}&wal={{wallet.id}}'"
                        :options="{width:240}"
                      ></qrcode>
                    </q-card-section>
@@ -453,9 +434,6 @@
                    </q-card-section>
                  </q-card>
                </q-expansion-item>
-
-                <q-separator></q-separator>
-                {% include "core/_api_docs.html" %}
              </q-list>
            </q-card-section>
          </q-card>
@@ -488,16 +466,17 @@
        </div>
      </div>

-      <q-dialog v-model="receive.show" position="top">
+      <q-dialog v-model="receive.show">
+        {% raw %}
        <q-card
          v-if="!receive.paymentReq"
          class="q-pa-lg q-pt-xl lnbits__dialog-card"
        >
          <q-form @submit="createInvoice" class="q-gutter-md">
            <p v-if="receive.lnurl" class="text-h6 text-center q-my-none">
-              <b v-text="receive.lnurl.domain"></b> is requesting an invoice:
+              <b>{{receive.lnurl.domain}}</b> is requesting an invoice:
            </p>
-            {% if LNBITS_DENOMINATION != 'sats' %}
+            {% endraw %} {% if LNBITS_DENOMINATION != 'sats' %}
            <q-input
              filled
              dense
@@ -541,6 +520,7 @@
              v-model.trim="receive.data.memo"
              :label="$t('memo')"
            ></q-input>
+            {% raw %}
            <div v-if="receive.status == 'pending'" class="row q-mt-lg">
              <q-btn
                unelevated
@@ -548,10 +528,9 @@
                :disable="receive.data.amount == null || receive.data.amount <= 0"
                type="submit"
              >
-                <span
-                  v-if="receive.lnurl"
-                  v-text="$t('withdraw_from') + receive.lnurl.domain"
-                ></span>
+                <span v-if="receive.lnurl">
+                  {{$t('withdraw_from')}} {{receive.lnurl.domain}}
+                </span>
                <span v-else v-text="$t('create_invoice')"></span>
              </q-btn>
              <q-btn
@@ -569,16 +548,15 @@
            ></q-spinner>
          </q-form>
        </q-card>
-        <q-card
-          v-else-if="receive.paymentReq && receive.lnurl == null"
-          class="q-pa-lg q-pt-xl lnbits__dialog-card"
-        >
+        <q-card v-else class="q-pa-lg q-pt-xl lnbits__dialog-card">
          <div class="text-center q-mb-lg">
            <a :href="'lightning:' + receive.paymentReq">
              <q-responsive :ratio="1" class="q-mx-xl">
-                <lnbits-qrcode
+                <qrcode
                  :value="'lightning:' + receive.paymentReq.toUpperCase()"
-                ></lnbits-qrcode>
+                  :options="{width: 340}"
+                  class="rounded-borders"
+                ></qrcode>
              </q-responsive>
            </a>
          </div>
@@ -598,32 +576,28 @@
            ></q-btn>
          </div>
        </q-card>
+        {% endraw %}
      </q-dialog>

-      <q-dialog v-model="parse.show" @hide="closeParseDialog" position="top">
+      <q-dialog v-model="parse.show" @hide="closeParseDialog">
        <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
          <div v-if="parse.invoice">
-            <h6
-              v-if="'{{LNBITS_DENOMINATION}}' != 'sats'"
-              class="q-my-none"
-              v-text="parseFloat(String(parse.invoice.fsat).replaceAll(',', '')) / 100 + '{{LNBITS_DENOMINATION}}'"
-            ></h6>
-            <h6
-              v-else
-              class="q-my-none"
-              v-text="parse.invoice.fsat + '{{LNBITS_DENOMINATION}}'"
-            ></h6>
+            <h6 v-if="'{{LNBITS_DENOMINATION}}' != 'sats'" class="q-my-none">
+              {% raw %} {{ parseFloat(String(parse.invoice.fsat).replaceAll(",",
+              "")) / 100 }} {% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
+            </h6>
+            <h6 v-else class="q-my-none">
+              {{ parse.invoice.fsat }}{% endraw %} {{LNBITS_DENOMINATION}} {%
+              raw %}
+            </h6>
            <q-separator class="q-my-sm"></q-separator>
            <p class="text-wrap">
-              <strong v-text="$t('memo') + ': '"></strong>
-              <span v-text="parse.invoice.description"></span>
-              <br />
-              <strong>Expire date: </strong>
-              <span v-text="parse.invoice.expireDate"></span>
-              <br />
-              <strong>Hash: </strong>
-              <span v-text="parse.invoice.hash"></span>
+              <strong v-text="$t('memo')">:</strong> {{
+              parse.invoice.description }}<br />
+              <strong>Expire date:</strong> {{ parse.invoice.expireDate }}<br />
+              <strong>Hash:</strong> {{ parse.invoice.hash }}
            </p>
+            {% endraw %}
            <div v-if="canPay" class="row q-mt-lg">
              <q-btn
                unelevated
@@ -657,31 +631,24 @@
            </div>
          </div>
          <div v-else-if="parse.lnurlauth">
+            {% raw %}
            <q-form @submit="authLnurl" class="q-gutter-md">
              <p class="q-my-none text-h6">
-                Authenticate with <b v-text="parse.lnurlauth.domain"></b>?
+                Authenticate with <b>{{ parse.lnurlauth.domain }}</b>?
              </p>
              <q-separator class="q-my-sm"></q-separator>
              <p>
                For every website and for every LNbits wallet, a new keypair
                will be deterministically generated so your identity can't be
                tied to your LNbits wallet or linked across websites. No other
-                data will be shared with
-                <span v-text="parse.lnurlauth.domain"></span>.
-              </p>
-              <p>
-                Your public key for <b v-text="parse.lnurlauth.domain"></b> is:
+                data will be shared with {{ parse.lnurlauth.domain }}.
              </p>
+              <p>Your public key for <b>{{ parse.lnurlauth.domain }}</b> is:</p>
              <p class="q-mx-xl">
-                <code class="text-wrap" v-text="parse.lnurlauth.pubkey"></code>
+                <code class="text-wrap"> {{ parse.lnurlauth.pubkey }} </code>
              </p>
              <div class="row q-mt-lg">
-                <q-btn
-                  unelevated
-                  color="primary"
-                  type="submit"
-                  :label="$t('login')"
-                ></q-btn>
+                <q-btn unelevated color="primary" type="submit">Login</q-btn>
                <q-btn
                  :label="$t('cancel')"
                  v-close-popup
@@ -691,74 +658,55 @@
                ></q-btn>
              </div>
            </q-form>
+            {% endraw %}
          </div>
          <div v-else-if="parse.lnurlpay">
+            {% raw %}
            <q-form @submit="payLnurl" class="q-gutter-md">
              <p v-if="parse.lnurlpay.fixed" class="q-my-none text-h6">
-                <b v-text="parse.lnurlpay.domain"></b> is requesting
-                <span
-                  v-text="msatoshiFormat(parse.lnurlpay.maxSendable)"
-                ></span>
-                <span v-text="'{{LNBITS_DENOMINATION}}'"></span>
+                <b>{{ parse.lnurlpay.domain }}</b> is requesting {{
+                parse.lnurlpay.maxSendable | msatoshiFormat }}
+                {{LNBITS_DENOMINATION}}
                <span v-if="parse.lnurlpay.commentAllowed > 0">
                  <br />
-                  and a
-                  <span v-text="parse.lnurlpay.commentAllowed"></span>-char
-                  comment
+                  and a {{parse.lnurlpay.commentAllowed}}-char comment
                </span>
              </p>
              <p v-else class="q-my-none text-h6 text-center">
-                <b
-                  v-text="parse.lnurlpay.targetUser || parse.lnurlpay.domain"
-                ></b>
+                <b>{{ parse.lnurlpay.targetUser || parse.lnurlpay.domain }}</b>
                is requesting <br />
                between
-                <b v-text="msatoshiFormat(parse.lnurlpay.minSendable)"></b> and
-                <b v-text="msatoshiFormat(parse.lnurlpay.maxSendable)"></b>
-                <span v-text="'{{LNBITS_DENOMINATION}}'"></span>
+                <b>{{ parse.lnurlpay.minSendable | msatoshiFormat }}</b> and
+                <b>{{ parse.lnurlpay.maxSendable | msatoshiFormat }}</b>
+                {% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
                <span v-if="parse.lnurlpay.commentAllowed > 0">
                  <br />
-                  and a
-                  <span v-text="parse.lnurlpay.commentAllowed"></span>-char
-                  comment
+                  and a {{parse.lnurlpay.commentAllowed}}-char comment
                </span>
              </p>
              <q-separator class="q-my-sm"></q-separator>
              <div class="row">
-                <p
-                  class="col text-justify text-italic"
-                  v-text="parse.lnurlpay.description"
-                ></p>
+                <p class="col text-justify text-italic">
+                  {{ parse.lnurlpay.description }}
+                </p>
                <p class="col-4 q-pl-md" v-if="parse.lnurlpay.image">
                  <q-img :src="parse.lnurlpay.image" />
                </p>
              </div>
              <div class="row">
                <div class="col">
-                  <q-select
-                    filled
-                    dense
-                    v-if="!parse.lnurlpay.fixed"
-                    v-model="parse.data.unit"
-                    type="text"
-                    :label="$t('unit')"
-                    :options="receive.units"
-                  ></q-select>
-                  <br />
+                  {% endraw %}
                  <q-input
-                    ref="setAmount"
                    filled
                    dense
                    v-model.number="parse.data.amount"
-                    :label="$t('amount') + ' (' + parse.data.unit + ') *'"
-                    :mask="parse.data.unit != 'sat' ? '#.##' : '#'"
-                    :step="parse.data.unit != 'sat' ? '0.01' : '1'"
-                    fill-mask="0"
-                    reverse-fill-mask
+                    type="number"
+                    label="Amount ({{LNBITS_DENOMINATION}}) *"
                    :min="parse.lnurlpay.minSendable / 1000"
                    :max="parse.lnurlpay.maxSendable / 1000"
-                    :readonly="parse.lnurlpay && parse.lnurlpay.fixed"
+                    :readonly="parse.lnurlpay.fixed"
                  ></q-input>
+                  {% raw %}
                </div>
                <div
                  class="col-8 q-pl-md"
@@ -775,7 +723,9 @@
                </div>
              </div>
              <div class="row q-mt-lg">
-                <q-btn unelevated color="primary" type="submit">Send</q-btn>
+                <q-btn unelevated color="primary" type="submit"
+                  >Send {{LNBITS_DENOMINATION}}</q-btn
+                >
                <q-btn
                  :label="$t('cancel')"
                  v-close-popup
@@ -785,6 +735,7 @@
                ></q-btn>
              </div>
            </q-form>
+            {% endraw %}
          </div>
          <div v-else>
            <q-form
@@ -815,11 +766,11 @@
                  class="q-mt-xs q-ml-sm q-mr-auto"
                  v-if="parse.copy.show"
                  @click="pasteToTextArea"
+                  ><q-tooltip
+                    >{% raw %}{{$t('paste_from_clipboard')}}{% endraw
+                    %}</q-tooltip
+                  ></q-icon
                >
-                  <q-tooltip>
-                    <span v-text="$t('paste_from_clipboard')"></span>
-                  </q-tooltip>
-                </q-icon>
                <q-btn
                  v-close-popup
                  flat
@@ -852,7 +803,7 @@
        </q-card>
      </q-dialog>

-      <q-dialog v-model="parse.camera.show" position="top">
+      <q-dialog v-model="parse.camera.show">
        <q-card class="q-pa-lg q-pt-xl">
          <div class="text-center q-mb-lg">
            <qrcode-stream
@@ -873,7 +824,7 @@
        </q-card>
      </q-dialog>

-      <q-dialog v-model="paymentsChart.show" position="top">
+      <q-dialog v-model="paymentsChart.show">
        <q-card class="q-pa-sm" style="width: 800px; max-width: unset">
          <q-card-section>
            <div class="row q-gutter-sm justify-between">
@@ -920,20 +871,16 @@
        </q-btn>
      </q-tabs>

-      <q-dialog v-model="disclaimerDialog.show" position="top">
+      <q-dialog v-model="disclaimerDialog.show">
        <q-card class="q-pa-lg">
-          <h6
-            class="q-my-md text-primary"
-            v-text="$t('disclaimer_dialog_title')"
-          ></h6>
-          <p class="whitespace-pre-line" v-text="$t('disclaimer_dialog')"></p>
+          <h6 class="q-my-md text-primary">Warning</h6>
+          <p v-text="$t('disclaimer_dialog')"></p>
          <div class="row q-mt-lg">
            <q-btn
              outline
              color="grey"
-              type="a"
-              href="/account"
-              :label="$t('my_account')"
+              @click="copyText(disclaimerDialog.location.href)"
+              :label="$t('copy_wallet_url')"
            ></q-btn>
            <q-btn
              v-close-popup
@@ -150,6 +150,7 @@
                Open channel
              </q-btn>
            </div>
+            {% raw %}
            <div>
              <div class="text-subtitle1 col-grow">Total</div>
              <lnbits-channel-balance
@@ -171,12 +172,11 @@
                <q-tr :props="props">
                  <div class="q-pb-sm">
                    <div class="row items-center q-gutter-sm">
-                      <div
-                        class="text-subtitle1 col-grow"
-                        v-text="props.row.name"
-                      ></div>
+                      <div class="text-subtitle1 col-grow">
+                        {{props.row.name}}
+                      </div>
                      <div class="text-caption" v-if="props.row.short_id">
-                        <span v-text="props.row.short_id"></span>
+                        {{ props.row.short_id }}
                        <q-btn
                          size="xs"
                          flat
@@ -188,8 +188,9 @@
                      <q-badge
                        rounded
                        :color="states.find(s => s.value == props.row.state)?.color"
-                        v-text="states.find(s => s.value == props.row.state)?.label"
                      >
+                        {{ states.find(s => s.value == props.row.state)?.label
+                        }}
                      </q-badge>
                      <q-btn
                        :disable='props.row.state !== "active"'
@@ -209,12 +210,15 @@
                </q-tr>
              </template>
            </q-table>
+
+            {% endraw %}
          </q-card-section>
        </q-card>
      </div>
      <div class="col-12 col-xl-6">
        <q-card class="full-height">
          <q-card-section class="column q-gutter-y-sm">
+            {% raw %}
            <div
              class="row items-center q-mt-none justify-between q-gutter-x-md no-wrap"
            >
@@ -250,21 +254,19 @@
                <q-tr :props="props">
                  <div class="row no-wrap items-center q-gutter-sm">
                    <div class="q-my-sm col-grow">
-                      <div
-                        class="text-subtitle1 text-bold"
-                        v-text="props.row.alias"
-                      ></div>
+                      <div class="text-subtitle1 text-bold">
+                        {{ props.row.alias }}
+                      </div>
                      <div class="row items-center q-gutter-sm">
                        <q-badge
                          :style="`background-color: #${props.row.color}`"
                          class="text-bold"
-                          v-text="'#'+props.row.color"
                        >
+                          #{{ props.row.color }}
                        </q-badge>
-                        <div
-                          class="text-bold"
-                          v-text="shortenNodeId(props.row.id)"
-                        ></div>
+                        <div class="text-bold">
+                          {{ shortenNodeId(props.row.id) }}
+                        </div>
                        <q-btn
                          size="xs"
                          flat
@@ -300,6 +302,8 @@
                </q-tr>
              </template>
            </q-table>
+
+            {% endraw %}
          </q-card-section>
        </q-card>
      </div>
@@ -1,12 +1,13 @@
 <q-tab-panel name="dashboard">
  <q-card-section class="q-pa-none">
+    {% raw %}
    <lnbits-node-info :info="this.info"></lnbits-node-info>
    <div class="row q-col-gutter-lg q-mt-sm">
      <div class="col-12 col-md-8 q-gutter-y-md">
        <div class="row q-col-gutter-md q-pb-lg">
          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
            <lnbits-stat
-              :title="$t('total_capacity')"
+              title="Total Capacity"
              :msat="this.channel_stats.total_capacity"
            />
          </div>
@@ -64,5 +65,6 @@
        ></lnbits-channel-stats>
      </div>
    </div>
+    {% endraw %}
  </q-card-section>
 </q-tab-panel>
@@ -3,6 +3,7 @@
    <q-dialog v-model="transactionDetailsDialog.show">
      <q-card class="my-card">
        <q-card-section>
+          {% raw %}
          <div class="text-center q-mb-lg">
            <div
              v-if="transactionDetailsDialog.data.isIn && transactionDetailsDialog.data.pending"
@@ -17,9 +18,7 @@
            <div class="row q-my-md">
              <div class="col-3"><b v-text="$t('payment_hash')"></b>:</div>
              <div class="col-9 text-wrap mono">
-                <span
-                  v-text="transactionDetailsDialog.data.payment_hash"
-                ></span>
+                {{ transactionDetailsDialog.data.payment_hash }}
                <q-icon
                  name="content_copy"
                  @click="copyText(transactionDetailsDialog.data.payment_hash)"
@@ -34,7 +33,7 @@
              >
                <div class="col-3"><b v-text="$t('payment_proof')"></b>:</div>
                <div class="col-9 text-wrap mono">
-                  <span v-text="transactionDetailsDialog.data.preimage"></span>
+                  {{ transactionDetailsDialog.data.preimage }}
                  <q-icon
                    name="content_copy"
                    @click="copyText(transactionDetailsDialog.data.preimage)"
@@ -67,6 +66,7 @@
              ></q-btn>
            </div>
          </div>
+          {% endraw %}
        </q-card-section>
      </q-card>
    </q-dialog>
@@ -102,6 +102,7 @@
              :filter="paymentsTable.filter"
              @request="getPayments"
            >
+              {% raw %}
              <template v-slot:body-cell-pending="props">
                <q-td auto-width class="text-center">
                  <q-icon
@@ -210,8 +211,9 @@
                    <q-badge
                      :style="`background-color: #${props.row.destination?.color}`"
                      class="text-bold"
-                      v-text="props.row.destination?.alias"
-                    ></q-badge>
+                    >
+                      {{ props.row.destination?.alias }}
+                    </q-badge>
                    <div>
                      <q-btn
                        size="xs"
@@ -231,6 +233,7 @@
                  </div>
                </q-td>
              </template>
+              {% endraw %}
            </q-table>
          </q-card-section>
        </q-card>
@@ -263,6 +266,7 @@
              :filter="invoiceTable.filter"
              @request="getInvoices"
            >
+              {% raw %}
              <template v-slot:body-cell-pending="props">
                <q-td auto-width class="text-center">
                  <q-icon
@@ -301,6 +305,8 @@
                  ></lnbits-date>
                </q-td>
              </template>
+
+              {% endraw %}
            </q-table>
          </q-card-section>
        </q-card>
@@ -42,11 +42,131 @@
 </div>

 {% endblock %} {% block scripts %} {{ window_vars(user) }}
-<script src="{{ static_url_for('static', 'js/node.js') }}"></script>
+<script src="/core/static/js/node.js"></script>
 <script>
  Vue.component(VueQrcode.name, VueQrcode)
  Vue.use(VueQrcodeReader)

+  {% raw %}
+  Vue.component('lnbits-stat',
+    {
+      props: ['title', 'amount', 'msat', 'btc'],
+      computed: {
+        value: function () {
+          return this.amount ?? (this.btc ? LNbits.utils.formatSat(this.btc) : LNbits.utils.formatMsat(this.msat))
+        }
+      },
+      template: `
+        <q-card>
+        <q-card-section>
+          <div class='text-overline text-primary'>
+            {{ title }}
+          </div>
+          <div>
+            <span class='text-h4 text-bold q-my-none'>{{ value }}</span>
+            <span class='text-h5' v-if='msat != undefined'>sats</span>
+            <span class='text-h5' v-if='btc != undefined'>BTC</span>
+          </div>
+        </q-card-section>
+        </q-card>
+      `
+    }
+  )
+
+
+  Vue.component('lnbits-channel-balance',
+    {
+      props: ['balance', 'color'],
+      methods: {
+        formatMsat: function (msat) {
+          return LNbits.utils.formatMsat(msat)
+        }
+      },
+      template: `
+        <div>
+                        <div class="row items-center justify-between">
+                          <span class="text-weight-thin">
+                            Local: {{ formatMsat(balance.local_msat) }}
+                            sats
+                          </span>
+                          <span class="text-weight-thin">
+                            Remote: {{ formatMsat(balance.remote_msat) }}
+                            sats
+                          </span>
+                        </div>
+
+                        <q-linear-progress
+                          rounded
+                          size="25px"
+                          :value="balance.local_msat / balance.total_msat"
+                          :color="color"
+                          :style="\`color: #\${this.color}\`"
+                        >
+                          <div class="absolute-full flex flex-center">
+                            <q-badge
+                              color="white"
+                              text-color="accent"
+                              :label="formatMsat(balance.total_msat) + ' sats'"
+                            >
+                              {{ balance.alias }}
+                            </q-badge>
+                          </div>
+                        </q-linear-progress>
+        </div>
+      `
+    }
+  )
+
+  Vue.component('lnbits-date',
+    {
+      props: ['ts'],
+      computed: {
+        date: function () {
+          return Quasar.utils.date.formatDate(
+            new Date(this.ts * 1000),
+            'YYYY-MM-DD HH:mm'
+          )
+        },
+        dateFrom: function () {
+          return moment(this.date).fromNow()
+        }
+      },
+      template: `
+        <div>
+          <q-tooltip>{{ this.date }}</q-tooltip>
+          {{ this.dateFrom }}
+        </div>
+      `
+    }
+  )
+
+
+  Vue.component('lnbits-date',
+    {
+      props: ['ts'],
+      computed: {
+        date: function () {
+          return Quasar.utils.date.formatDate(
+            new Date(this.ts * 1000),
+            'YYYY-MM-DD HH:mm'
+          )
+        },
+        dateFrom: function () {
+          return moment(this.date).fromNow()
+        }
+      },
+      template: `
+        <div>
+          <q-tooltip>{{ this.date }}</q-tooltip>
+          {{ this.dateFrom }}
+        </div>
+      `
+    }
+  )
+
+  {% endraw %}
+
+
  new Vue({
    el: '#vue',
    config: {
@@ -70,12 +190,13 @@
          filter: ''
        },

+
        activeBalance: {},
        ranks: {},

        peers: {
          data: [],
-          filter: ''
+          filter: '',
        },

        connectPeerDialog: {
@@ -194,7 +315,7 @@
              label: this.$t('amount') + ' (' + LNBITS_DENOMINATION + ')',
              field: row => this.formatMsat(row.amount),
              sortable: true
-            }
+            },
          ],
          pagination: {
            rowsPerPage: 10,
@@ -225,11 +346,9 @@
        return !_.isEqual(this.settings, this.formData)
      },
      filteredChannels: function () {
-        return this.stateFilters
-          ? this.channels.data.filter(channel => {
-              return this.stateFilters.find(({value}) => value == channel.state)
-            })
-          : this.channels.data
+        return this.stateFilters ? this.channels.data.filter(channel => {
+          return this.stateFilters.find(({value}) => value == channel.state)
+        }) : this.channels.data
      },
      totalBalance: function () {
        return this.filteredChannels.reduce(
@@ -241,7 +360,7 @@
          },
          {local_msat: 0, remote_msat: 0, total_msat: 0}
        )
-      }
+      },
    },
    methods: {
      formatMsat: function (msat) {
@@ -249,27 +368,30 @@
      },
      api: function (method, url, options) {
        const params = new URLSearchParams(options?.query)
-        return LNbits.api
-          .request(method, `/node/api/v1${url}?${params}`, {}, options?.data)
+        params.set('usr', this.g.user.id)
+        return LNbits.api.request(method, `/node/api/v1${url}?${params}`, {}, options?.data)
          .catch(error => {
            LNbits.utils.notifyApiError(error)
          })
      },
      getChannels: function () {
-        return this.api('GET', '/channels').then(response => {
-          this.channels.data = response.data
-        })
+        return this.api('GET', '/channels')
+          .then(response => {
+            this.channels.data = response.data
+          })
      },
      getInfo: function () {
-        return this.api('GET', '/info').then(response => {
-          this.info = response.data
-          this.channel_stats = response.data.channel_stats
-        })
+        return this.api('GET', '/info')
+          .then(response => {
+            this.info = response.data
+            this.channel_stats = response.data.channel_stats
+          })
      },
      get1MLStats: function () {
-        return this.api('GET', '/rank').then(response => {
-          this.ranks = response.data
-        })
+        return this.api('GET', '/rank')
+          .then(response => {
+            this.ranks = response.data
+          })
      },
      getPayments: function (props) {
        if (props) {
@@ -278,12 +400,13 @@
        let pagination = this.paymentsTable.pagination
        const query = {
          limit: pagination.rowsPerPage,
-          offset: (pagination.page - 1) * pagination.rowsPerPage ?? 0
+          offset: ((pagination.page - 1) * pagination.rowsPerPage) ?? 0,
        }
-        return this.api('GET', '/payments', {query}).then(response => {
-          this.paymentsTable.data = response.data.data
-          this.paymentsTable.pagination.rowsNumber = response.data.total
-        })
+        return this.api('GET', '/payments', {query})
+          .then(response => {
+            this.paymentsTable.data = response.data.data
+            this.paymentsTable.pagination.rowsNumber = response.data.total
+          })
      },
      getInvoices: function (props) {
        if (props) {
@@ -292,40 +415,44 @@
        let pagination = this.invoiceTable.pagination
        const query = {
          limit: pagination.rowsPerPage,
-          offset: (pagination.page - 1) * pagination.rowsPerPage ?? 0
+          offset: ((pagination.page - 1) * pagination.rowsPerPage) ?? 0,
        }
-        return this.api('GET', '/invoices', {query}).then(response => {
-          this.invoiceTable.data = response.data.data
-          this.invoiceTable.pagination.rowsNumber = response.data.total
-        })
+        return this.api('GET', '/invoices', {query})
+          .then(response => {
+            this.invoiceTable.data = response.data.data
+            this.invoiceTable.pagination.rowsNumber = response.data.total
+          })
      },
      getPeers: function () {
-        return this.api('GET', '/peers').then(response => {
-          this.peers.data = response.data
-          console.log('peers', this.peers)
-        })
+        return this.api('GET', '/peers')
+          .then(response => {
+            this.peers.data = response.data
+            console.log('peers', this.peers)
+          })
      },
      connectPeer: function () {
        console.log('peer', this.connectPeerDialog)
-        this.api('POST', '/peers', {data: this.connectPeerDialog.data}).then(
-          () => {
+        this.api('POST', '/peers', {data: this.connectPeerDialog.data})
+          .then(() => {
            this.connectPeerDialog.show = false
            this.getPeers()
-          }
-        )
+          })
      },
-      disconnectPeer: function (id) {
+      disconnectPeer: function(id) {
        LNbits.utils
-          .confirmDialog('Do you really wanna disconnect this peer?')
+          .confirmDialog(
+            'Do you really wanna disconnect this peer?'
+          )
          .onOk(() => {
-            this.api('DELETE', `/peers/${id}`).then(response => {
-              this.$q.notify({
-                message: 'Disconnected',
-                icon: null
+            this.api('DELETE', `/peers/${id}`)
+              .then(response => {
+                this.$q.notify({
+                  message: 'Disconnected',
+                  icon: null
+                })
+                this.needsRestart = true
+                this.getPeers()
              })
-              this.needsRestart = true
-              this.getPeers()
-            })
          })
      },
      openChannel: function () {
@@ -340,19 +467,14 @@
      },
      showCloseChannelDialog: function (channel) {
        this.closeChannelDialog.show = true
-        this.closeChannelDialog.data = {
-          force: false,
-          short_id: channel.short_id,
-          ...channel.point
-        }
+        this.closeChannelDialog.data = {force: false, short_id: channel.short_id, ...channel.point}
      },
      closeChannel: function () {
-        this.api('DELETE', '/channels', {
-          query: this.closeChannelDialog.data
-        }).then(response => {
-          this.closeChannelDialog.show = false
-          this.getChannels()
-        })
+        this.api('DELETE', '/channels', {query: this.closeChannelDialog.data})
+          .then(response => {
+            this.closeChannelDialog.show = false
+            this.getChannels()
+          })
      },
      showOpenChannelDialog: function (peer_id) {
        this.openChannelDialog.show = true
@@ -367,7 +489,9 @@
        this.transactionDetailsDialog.data = details
        console.log('details', details)
      },
-      exportCSV: function () {},
+      exportCSV: function () {
+
+      },
      shortenNodeId
    }
  })
@@ -9,7 +9,7 @@ context %} {% block page %}
      <div class="row q-col-gutter-md q-pb-lg">
        <div class="col-12 col-md-6 q-gutter-y-md">
          <lnbits-stat
-            :title="$t('total_capacity')"
+            title="Total Capacity"
            :msat="this.channel_stats.total_capacity"
          />
        </div>
@@ -51,11 +51,16 @@ context %} {% block page %}
 </div>

 {% endblock %} {% block scripts %} {{ window_vars(user) }}
-<script src="{{ static_url_for('static', 'js/node.js') }}"></script>
+<script src="/core/static/js/node.js"></script>
 <script>
  Vue.component(VueQrcode.name, VueQrcode)
  Vue.use(VueQrcodeReader)

+  {% raw %}
+
+  {% endraw %}
+
+
  new Vue({
    el: '#vue',
    config: {
@@ -104,7 +109,7 @@ context %} {% block page %}
          {label: 'Pending', value: 'pending', color: 'orange'},
          {label: 'Inactive', value: 'inactive', color: 'grey'},
          {label: 'Closed', value: 'closed', color: 'red'}
-        ]
+        ],
      }
    },
    created: function () {
@@ -119,16 +124,18 @@ context %} {% block page %}
        return LNbits.api.request(method, '/node/public/api/v1' + url, {}, data)
      },
      getInfo: function () {
-        this.api('GET', '/info', {}).then(response => {
-          this.info = response.data
-          this.channel_stats = response.data.channel_stats
-        })
+        this.api('GET', '/info', {})
+          .then(response => {
+            this.info = response.data
+            this.channel_stats = response.data.channel_stats
+          })
      },
      get1MLStats: function () {
-        this.api('GET', '/rank', {}).then(response => {
-          this.ranks = response.data
-        })
-      }
+        this.api('GET', '/rank', {})
+          .then(response => {
+            this.ranks = response.data
+          })
+      },
    }
  })
 </script>
@@ -17,20 +17,18 @@ from lnbits.core.services import (
    update_cached_settings,
    update_wallet_balance,
 )
-from lnbits.core.tasks import api_invoice_listeners
 from lnbits.decorators import check_admin, check_super_user
 from lnbits.server import server_restart
 from lnbits.settings import AdminSettings, UpdateSettings, settings
-from lnbits.tasks import invoice_listeners

 from .. import core_app_extra
 from ..crud import delete_admin_settings, get_admin_settings, update_admin_settings

-admin_router = APIRouter(tags=["Admin UI"], prefix="/admin")
+admin_router = APIRouter()


@admin_router.get(
-    "/api/v1/audit",
+    "/admin/api/v1/audit",
    name="Audit",
    description="show the current balance of the node and the LNbits database",
    dependencies=[Depends(check_admin)],
@@ -50,20 +48,7 @@ async def api_auditor():
        )


-@admin_router.get(
-    "/api/v1/monitor",
-    name="Monitor",
-    description="show the current listeners and other monitoring data",
-    dependencies=[Depends(check_admin)],
-)
-async def api_monitor():
-    return {
-        "invoice_listeners": list(invoice_listeners.keys()),
-        "api_invoice_listeners": list(api_invoice_listeners.keys()),
-    }
-
-
-@admin_router.get("/api/v1/settings", response_model=Optional[AdminSettings])
+@admin_router.get("/admin/api/v1/settings/", response_model=Optional[AdminSettings])
 async def api_get_settings(
    user: User = Depends(check_admin),
 ) -> Optional[AdminSettings]:
@@ -72,7 +57,7 @@ async def api_get_settings(


@admin_router.put(
-    "/api/v1/settings",
+    "/admin/api/v1/settings/",
    status_code=HTTPStatus.OK,
 )
 async def api_update_settings(data: UpdateSettings, user: User = Depends(check_admin)):
@@ -85,7 +70,7 @@ async def api_update_settings(data: UpdateSettings, user: User = Depends(check_a


@admin_router.delete(
-    "/api/v1/settings",
+    "/admin/api/v1/settings/",
    status_code=HTTPStatus.OK,
    dependencies=[Depends(check_super_user)],
 )
@@ -95,7 +80,7 @@ async def api_delete_settings() -> None:


@admin_router.get(
-    "/api/v1/restart",
+    "/admin/api/v1/restart/",
    status_code=HTTPStatus.OK,
    dependencies=[Depends(check_super_user)],
 )
@@ -105,7 +90,7 @@ async def api_restart_server() -> dict[str, str]:


@admin_router.put(
-    "/api/v1/topup",
+    "/admin/api/v1/topup/",
    name="Topup",
    status_code=HTTPStatus.OK,
    dependencies=[Depends(check_super_user)],
@@ -129,7 +114,7 @@ async def api_topup_balance(data: CreateTopup) -> dict[str, str]:


@admin_router.get(
-    "/api/v1/backup",
+    "/admin/api/v1/backup/",
    status_code=HTTPStatus.OK,
    dependencies=[Depends(check_super_user)],
    response_class=FileResponse,
@@ -1,52 +1,117 @@
+import asyncio
+import base64
 import hashlib
 import json
+import uuid
 from http import HTTPStatus
 from io import BytesIO
-from typing import Dict, List
-from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
+from typing import Dict, List, Optional, Union
+from urllib.parse import ParseResult, parse_qs, unquote, urlencode, urlparse, urlunparse

 import httpx
 import pyqrcode
 from fastapi import (
    APIRouter,
+    Body,
    Depends,
+    Header,
+    Request,
+    WebSocket,
+    WebSocketDisconnect,
 )
 from fastapi.exceptions import HTTPException
-from starlette.responses import StreamingResponse
+from fastapi.responses import JSONResponse
+from loguru import logger
+from sse_starlette.sse import EventSourceResponse
+from starlette.responses import RedirectResponse, StreamingResponse

+from lnbits import bolt11, lnurl
+from lnbits.core.db import core_app_extra, db
+from lnbits.core.helpers import (
+    migrate_extension_database,
+    stop_extension_background_work,
+)
 from lnbits.core.models import (
-    BaseWallet,
    ConversionData,
+    CreateInvoice,
+    CreateLnurl,
    CreateLnurlAuth,
    CreateWallet,
+    CreateWebPushSubscription,
+    DecodePayment,
+    Payment,
+    PaymentFilters,
+    PaymentHistoryPoint,
+    Query,
    User,
    Wallet,
+    WalletType,
+    WebPushSubscription,
 )
+from lnbits.db import Filters, Page
 from lnbits.decorators import (
    WalletTypeInfo,
-    check_user_exists,
+    check_admin,
    get_key_type,
+    parse_filters,
    require_admin_key,
+    require_invoice_key,
 )
-from lnbits.lnurl import decode as lnurl_decode
+from lnbits.extension_manager import (
+    CreateExtension,
+    Extension,
+    ExtensionRelease,
+    InstallableExtension,
+    fetch_github_release_config,
+    get_valid_extensions,
+)
+from lnbits.helpers import generate_filter_params_openapi, url_for
 from lnbits.settings import settings
 from lnbits.utils.exchange_rates import (
-    allowed_currencies,
+    currencies,
    fiat_amount_as_satoshis,
    satoshis_amount_as_fiat,
 )

 from ..crud import (
+    DateTrunc,
+    add_installed_extension,
    create_account,
+    create_tinyurl,
    create_wallet,
+    create_webpush_subscription,
+    delete_dbversion,
+    delete_installed_extension,
+    delete_tinyurl,
+    delete_wallet,
+    delete_webpush_subscription,
+    drop_extension_db,
+    get_dbversions,
+    get_payments,
+    get_payments_history,
+    get_payments_paginated,
+    get_standalone_payment,
+    get_tinyurl,
+    get_tinyurl_by_url,
+    get_wallet_for_key,
+    get_webpush_subscription,
+    save_balance_check,
+    update_pending_payments,
+    update_wallet,
 )
-from ..services import perform_lnurlauth
+from ..services import (
+    InvoiceFailure,
+    PaymentFailure,
+    check_transaction_status,
+    create_invoice,
+    pay_invoice,
+    perform_lnurlauth,
+    websocketManager,
+    websocketUpdater,
+)
+from ..tasks import api_invoice_listeners

-# backwards compatibility for extension
-# TODO: remove api_payment and pay_invoice imports from extensions
-from .payment_api import api_payment, pay_invoice  # noqa: F401
-
-api_router = APIRouter(tags=["Core"])
+api_router = APIRouter()


@api_router.get("/api/v1/health", status_code=HTTPStatus.OK)
@@ -54,18 +119,60 @@ async def health():
    return


-@api_router.get(
-    "/api/v1/wallets",
-    name="Wallets",
-    description="Get basic info for all of user's wallets.",
-)
-async def api_wallets(user: User = Depends(check_user_exists)) -> List[BaseWallet]:
-    return [BaseWallet(**w.dict()) for w in user.wallets]
+@api_router.get("/api/v1/wallet")
+async def api_wallet(wallet: WalletTypeInfo = Depends(get_key_type)):
+    if wallet.wallet_type == WalletType.admin:
+        return {
+            "id": wallet.wallet.id,
+            "name": wallet.wallet.name,
+            "balance": wallet.wallet.balance_msat,
+        }
+    else:
+        return {"name": wallet.wallet.name, "balance": wallet.wallet.balance_msat}
+
+
+@api_router.put("/api/v1/wallet/{new_name}")
+async def api_update_wallet_name(
+    new_name: str, wallet: WalletTypeInfo = Depends(require_admin_key)
+):
+    await update_wallet(wallet.wallet.id, new_name)
+    return {
+        "id": wallet.wallet.id,
+        "name": wallet.wallet.name,
+        "balance": wallet.wallet.balance_msat,
+    }
+
+
+@api_router.patch("/api/v1/wallet", response_model=Wallet)
+async def api_update_wallet(
+    name: Optional[str] = Body(None),
+    currency: Optional[str] = Body(None),
+    wallet: WalletTypeInfo = Depends(require_admin_key),
+):
+    return await update_wallet(wallet.wallet.id, name, currency)
+
+
+@api_router.delete("/api/v1/wallet")
+async def api_delete_wallet(
+    wallet: WalletTypeInfo = Depends(require_admin_key),
+) -> None:
+    await delete_wallet(
+        user_id=wallet.wallet.user,
+        wallet_id=wallet.wallet.id,
+    )
+
+
+@api_router.post("/api/v1/wallet", response_model=Wallet)
+async def api_create_wallet(
+    data: CreateWallet,
+    wallet: WalletTypeInfo = Depends(require_admin_key),
+) -> Wallet:
+    return await create_wallet(user_id=wallet.wallet.user, wallet_name=data.name)


@api_router.post("/api/v1/account", response_model=Wallet)
 async def api_create_account(data: CreateWallet) -> Wallet:
-    if not settings.new_accounts_allowed:
+    if len(settings.lnbits_allowed_users) > 0:
        raise HTTPException(
            status_code=HTTPStatus.BAD_REQUEST,
            detail="Account creation is disabled.",
@@ -74,10 +181,370 @@ async def api_create_account(data: CreateWallet) -> Wallet:
    return await create_wallet(user_id=account.id, wallet_name=data.name)


+@api_router.get(
+    "/api/v1/payments",
+    name="Payment List",
+    summary="get list of payments",
+    response_description="list of payments",
+    response_model=List[Payment],
+    openapi_extra=generate_filter_params_openapi(PaymentFilters),
+)
+async def api_payments(
+    wallet: WalletTypeInfo = Depends(get_key_type),
+    filters: Filters = Depends(parse_filters(PaymentFilters)),
+):
+    await update_pending_payments(wallet.wallet.id)
+    return await get_payments(
+        wallet_id=wallet.wallet.id,
+        pending=True,
+        complete=True,
+        filters=filters,
+    )
+
+
+@api_router.get(
+    "/api/v1/payments/history",
+    name="Get payments history",
+    response_model=List[PaymentHistoryPoint],
+    openapi_extra=generate_filter_params_openapi(PaymentFilters),
+)
+async def api_payments_history(
+    wallet: WalletTypeInfo = Depends(get_key_type),
+    group: DateTrunc = Query("day"),
+    filters: Filters[PaymentFilters] = Depends(parse_filters(PaymentFilters)),
+):
+    await update_pending_payments(wallet.wallet.id)
+    return await get_payments_history(wallet.wallet.id, group, filters)
+
+
+@api_router.get(
+    "/api/v1/payments/paginated",
+    name="Payment List",
+    summary="get paginated list of payments",
+    response_description="list of payments",
+    response_model=Page[Payment],
+    openapi_extra=generate_filter_params_openapi(PaymentFilters),
+)
+async def api_payments_paginated(
+    wallet: WalletTypeInfo = Depends(get_key_type),
+    filters: Filters = Depends(parse_filters(PaymentFilters)),
+):
+    await update_pending_payments(wallet.wallet.id)
+    page = await get_payments_paginated(
+        wallet_id=wallet.wallet.id,
+        pending=True,
+        complete=True,
+        filters=filters,
+    )
+    return page
+
+
+async def api_payments_create_invoice(data: CreateInvoice, wallet: Wallet):
+    description_hash = b""
+    unhashed_description = b""
+    memo = data.memo or settings.lnbits_site_title
+    if data.description_hash or data.unhashed_description:
+        if data.description_hash:
+            try:
+                description_hash = bytes.fromhex(data.description_hash)
+            except ValueError:
+                raise HTTPException(
+                    status_code=HTTPStatus.BAD_REQUEST,
+                    detail="'description_hash' must be a valid hex string",
+                )
+        if data.unhashed_description:
+            try:
+                unhashed_description = bytes.fromhex(data.unhashed_description)
+            except ValueError:
+                raise HTTPException(
+                    status_code=HTTPStatus.BAD_REQUEST,
+                    detail="'unhashed_description' must be a valid hex string",
+                )
+        # do not save memo if description_hash or unhashed_description is set
+        memo = ""
+
+    async with db.connect() as conn:
+        try:
+            payment_hash, payment_request = await create_invoice(
+                wallet_id=wallet.id,
+                amount=data.amount,
+                memo=memo,
+                currency=data.unit,
+                description_hash=description_hash,
+                unhashed_description=unhashed_description,
+                expiry=data.expiry,
+                extra=data.extra,
+                webhook=data.webhook,
+                internal=data.internal,
+                conn=conn,
+            )
+            # NOTE: we get the checking_id with a seperate query because create_invoice
+            # does not return it and it would be a big hustle to change its return type
+            # (used across extensions)
+            payment_db = await get_standalone_payment(payment_hash, conn=conn)
+            assert payment_db is not None, "payment not found"
+            checking_id = payment_db.checking_id
+        except InvoiceFailure as e:
+            raise HTTPException(status_code=520, detail=str(e))
+        except Exception as exc:
+            raise exc
+
+    invoice = bolt11.decode(payment_request)
+
+    lnurl_response: Union[None, bool, str] = None
+    if data.lnurl_callback:
+        if data.lnurl_balance_check is not None:
+            await save_balance_check(wallet.id, data.lnurl_balance_check)
+
+        async with httpx.AsyncClient() as client:
+            try:
+                r = await client.get(
+                    data.lnurl_callback,
+                    params={
+                        "pr": payment_request,
+                        "balanceNotify": url_for(
+                            f"/withdraw/notify/{urlparse(data.lnurl_callback).netloc}",
+                            external=True,
+                            wal=wallet.id,
+                        ),
+                    },
+                    timeout=10,
+                )
+                if r.is_error:
+                    lnurl_response = r.text
+                else:
+                    resp = json.loads(r.text)
+                    if resp["status"] != "OK":
+                        lnurl_response = resp["reason"]
+                    else:
+                        lnurl_response = True
+            except (httpx.ConnectError, httpx.RequestError) as ex:
+                logger.error(ex)
+                lnurl_response = False
+
+    return {
+        "payment_hash": invoice.payment_hash,
+        "payment_request": payment_request,
+        # maintain backwards compatibility with API clients:
+        "checking_id": checking_id,
+        "lnurl_response": lnurl_response,
+    }
+
+
+async def api_payments_pay_invoice(bolt11: str, wallet: Wallet):
+    try:
+        payment_hash = await pay_invoice(wallet_id=wallet.id, payment_request=bolt11)
+    except ValueError as e:
+        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST, detail=str(e))
+    except PermissionError as e:
+        raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail=str(e))
+    except PaymentFailure as e:
+        raise HTTPException(status_code=520, detail=str(e))
+    except Exception as exc:
+        raise exc
+
+    return {
+        "payment_hash": payment_hash,
+        # maintain backwards compatibility with API clients:
+        "checking_id": payment_hash,
+    }
+
+
+@api_router.post(
+    "/api/v1/payments",
+    summary="Create or pay an invoice",
+    description="""
+        This endpoint can be used both to generate and pay a BOLT11 invoice.
+        To generate a new invoice for receiving funds into the authorized account,
+        specify at least the first four fields in the POST body: `out: false`,
+        `amount`, `unit`, and `memo`. To pay an arbitrary invoice from the funds
+        already in the authorized account, specify `out: true` and use the `bolt11`
+        field to supply the BOLT11 invoice to be paid.
+    """,
+    status_code=HTTPStatus.CREATED,
+)
+async def api_payments_create(
+    wallet: WalletTypeInfo = Depends(require_invoice_key),
+    invoiceData: CreateInvoice = Body(...),
+):
+    if invoiceData.out is True and wallet.wallet_type == WalletType.admin:
+        if not invoiceData.bolt11:
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail="BOLT11 string is invalid or not given",
+            )
+        return await api_payments_pay_invoice(
+            invoiceData.bolt11, wallet.wallet
+        )  # admin key
+    elif not invoiceData.out:
+        # invoice key
+        return await api_payments_create_invoice(invoiceData, wallet.wallet)
+    else:
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED,
+            detail="Invoice (or Admin) key required.",
+        )
+
+
+@api_router.post("/api/v1/payments/lnurl")
+async def api_payments_pay_lnurl(
+    data: CreateLnurl, wallet: WalletTypeInfo = Depends(require_admin_key)
+):
+    domain = urlparse(data.callback).netloc
+
+    async with httpx.AsyncClient() as client:
+        try:
+            r = await client.get(
+                data.callback,
+                params={"amount": data.amount, "comment": data.comment},
+                timeout=40,
+            )
+            if r.is_error:
+                raise httpx.ConnectError("LNURL callback connection error")
+        except (httpx.ConnectError, httpx.RequestError):
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail=f"Failed to connect to {domain}.",
+            )
+
+    params = json.loads(r.text)
+    if params.get("status") == "ERROR":
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail=f"{domain} said: '{params.get('reason', '')}'",
+        )
+
+    if not params.get("pr"):
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail=f"{domain} did not return a payment request.",
+        )
+
+    invoice = bolt11.decode(params["pr"])
+    if invoice.amount_msat != data.amount:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail=(
+                (
+                    f"{domain} returned an invalid invoice. Expected"
+                    f" {data.amount} msat, got {invoice.amount_msat}."
+                ),
+            ),
+        )
+
+    extra = {}
+
+    if params.get("successAction"):
+        extra["success_action"] = params["successAction"]
+    if data.comment:
+        extra["comment"] = data.comment
+    assert data.description is not None, "description is required"
+    payment_hash = await pay_invoice(
+        wallet_id=wallet.wallet.id,
+        payment_request=params["pr"],
+        description=data.description,
+        extra=extra,
+    )
+
+    return {
+        "success_action": params.get("successAction"),
+        "payment_hash": payment_hash,
+        # maintain backwards compatibility with API clients:
+        "checking_id": payment_hash,
+    }
+
+
+async def subscribe_wallet_invoices(request: Request, wallet: Wallet):
+    """
+    Subscribe to new invoices for a wallet. Can be wrapped in EventSourceResponse.
+    Listenes invoming payments for a wallet and yields jsons with payment details.
+    """
+    this_wallet_id = wallet.id
+
+    payment_queue: asyncio.Queue[Payment] = asyncio.Queue(0)
+
+    uid = f"{this_wallet_id}_{str(uuid.uuid4())[:8]}"
+    logger.debug(f"adding sse listener for wallet: {uid}")
+    api_invoice_listeners[uid] = payment_queue
+
+    try:
+        while True:
+            if await request.is_disconnected():
+                await request.close()
+                break
+            payment: Payment = await payment_queue.get()
+            if payment.wallet_id == this_wallet_id:
+                logger.debug("sse listener: payment received", payment)
+                yield dict(data=payment.json(), event="payment-received")
+    except asyncio.CancelledError:
+        logger.debug(f"removing listener for wallet {uid}")
+    except Exception as exc:
+        logger.error(f"Error in sse: {exc}")
+    finally:
+        api_invoice_listeners.pop(uid)
+
+
+@api_router.get("/api/v1/payments/sse")
+async def api_payments_sse(
+    request: Request, wallet: WalletTypeInfo = Depends(get_key_type)
+):
+    return EventSourceResponse(
+        subscribe_wallet_invoices(request, wallet.wallet),
+        ping=20,
+        media_type="text/event-stream",
+    )
+
+
+# TODO: refactor this route into a public and admin one
+@api_router.get("/api/v1/payments/{payment_hash}")
+async def api_payment(payment_hash, X_Api_Key: Optional[str] = Header(None)):
+    # We use X_Api_Key here because we want this call to work with and without keys
+    # If a valid key is given, we also return the field "details", otherwise not
+    wallet = await get_wallet_for_key(X_Api_Key) if isinstance(X_Api_Key, str) else None
+    wallet = wallet if wallet and not wallet.deleted else None
+    # we have to specify the wallet id here, because postgres and sqlite return
+    # internal payments in different order and get_standalone_payment otherwise
+    # just fetches the first one, causing unpredictable results
+    payment = await get_standalone_payment(
+        payment_hash, wallet_id=wallet.id if wallet else None
+    )
+    if payment is None:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Payment does not exist."
+        )
+    await check_transaction_status(payment.wallet_id, payment_hash)
+    payment = await get_standalone_payment(
+        payment_hash, wallet_id=wallet.id if wallet else None
+    )
+    if not payment:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Payment does not exist."
+        )
+    elif not payment.pending:
+        if wallet and wallet.id == payment.wallet_id:
+            return {"paid": True, "preimage": payment.preimage, "details": payment}
+        return {"paid": True, "preimage": payment.preimage}
+
+    try:
+        await payment.check_status()
+    except Exception:
+        if wallet and wallet.id == payment.wallet_id:
+            return {"paid": False, "details": payment}
+        return {"paid": False}
+
+    if wallet and wallet.id == payment.wallet_id:
+        return {
+            "paid": not payment.pending,
+            "preimage": payment.preimage,
+            "details": payment,
+        }
+    return {"paid": not payment.pending, "preimage": payment.preimage}
+
+
@api_router.get("/api/v1/lnurlscan/{code}")
 async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type)):
    try:
-        url = str(lnurl_decode(code))
+        url = lnurl.decode(code)
        domain = urlparse(url).netloc
    except Exception:
        # parse internet identifier (user@domain.com)
@@ -107,8 +574,7 @@ async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type
        assert lnurlauth_key.verifying_key
        params.update(pubkey=lnurlauth_key.verifying_key.to_string("compressed").hex())
    else:
-        headers = {"User-Agent": settings.user_agent}
-        async with httpx.AsyncClient(headers=headers, follow_redirects=True) as client:
+        async with httpx.AsyncClient(follow_redirects=True) as client:
            r = await client.get(url, timeout=5)
            r.raise_for_status()
            if r.is_error:
@@ -190,6 +656,23 @@ async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type
    return params


+@api_router.post("/api/v1/payments/decode", status_code=HTTPStatus.OK)
+async def api_payments_decode(data: DecodePayment) -> JSONResponse:
+    payment_str = data.data
+    try:
+        if payment_str[:5] == "LNURL":
+            url = lnurl.decode(payment_str)
+            return JSONResponse({"domain": url})
+        else:
+            invoice = bolt11.decode(payment_str)
+            return JSONResponse(invoice.data)
+    except Exception as exc:
+        return JSONResponse(
+            {"message": f"Failed to decode: {str(exc)}"},
+            status_code=HTTPStatus.BAD_REQUEST,
+        )
+
+
@api_router.post("/api/v1/lnurlauth")
 async def api_perform_lnurlauth(
    data: CreateLnurlAuth, wallet: WalletTypeInfo = Depends(require_admin_key)
@@ -203,8 +686,14 @@ async def api_perform_lnurlauth(


@api_router.get("/api/v1/currencies")
-async def api_list_currencies_available() -> List[str]:
-    return allowed_currencies()
+async def api_list_currencies_available():
+    if len(settings.lnbits_allowed_currencies) > 0:
+        return [
+            item
+            for item in currencies.keys()
+            if item.upper() in settings.lnbits_allowed_currencies
+        ]
+    return list(currencies.keys())


@api_router.post("/api/v1/conversion")
@@ -244,3 +733,312 @@ async def img(data):
            "Expires": "0",
        },
    )
+
+
+@api_router.websocket("/api/v1/ws/{item_id}")
+async def websocket_connect(websocket: WebSocket, item_id: str):
+    await websocketManager.connect(websocket, item_id)
+    try:
+        while True:
+            await websocket.receive_text()
+    except WebSocketDisconnect:
+        websocketManager.disconnect(websocket)
+
+
+@api_router.post("/api/v1/ws/{item_id}")
+async def websocket_update_post(item_id: str, data: str):
+    try:
+        await websocketUpdater(item_id, data)
+        return {"sent": True, "data": data}
+    except Exception:
+        return {"sent": False, "data": data}
+
+
+@api_router.get("/api/v1/ws/{item_id}/{data}")
+async def websocket_update_get(item_id: str, data: str):
+    try:
+        await websocketUpdater(item_id, data)
+        return {"sent": True, "data": data}
+    except Exception:
+        return {"sent": False, "data": data}
+
+
+@api_router.post("/api/v1/extension")
+async def api_install_extension(
+    data: CreateExtension, user: User = Depends(check_admin)
+):
+    release = await InstallableExtension.get_extension_release(
+        data.ext_id, data.source_repo, data.archive
+    )
+    if not release:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Release not found"
+        )
+
+    if not release.is_version_compatible:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST, detail="Incompatible extension version"
+        )
+
+    ext_info = InstallableExtension(
+        id=data.ext_id, name=data.ext_id, installed_release=release, icon=release.icon
+    )
+
+    ext_info.download_archive()
+
+    try:
+        ext_info.extract_archive()
+
+        extension = Extension.from_installable_ext(ext_info)
+
+        db_version = (await get_dbversions()).get(data.ext_id, 0)
+        await migrate_extension_database(extension, db_version)
+
+        await add_installed_extension(ext_info)
+
+        # call stop while the old routes are still active
+        await stop_extension_background_work(data.ext_id, user.id)
+
+        if data.ext_id not in settings.lnbits_deactivated_extensions:
+            settings.lnbits_deactivated_extensions += [data.ext_id]
+
+        # mount routes for the new version
+        core_app_extra.register_new_ext_routes(extension)
+
+        if extension.upgrade_hash:
+            ext_info.nofiy_upgrade()
+
+        return extension
+
+    except Exception as ex:
+        logger.warning(ex)
+        ext_info.clean_extension_files()
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=(
+                f"Failed to install extension {ext_info.id} "
+                f"({ext_info.installed_version})."
+            ),
+        )
+
+
+@api_router.delete("/api/v1/extension/{ext_id}")
+async def api_uninstall_extension(ext_id: str, user: User = Depends(check_admin)):
+    installable_extensions = await InstallableExtension.get_installable_extensions()
+
+    extensions = [e for e in installable_extensions if e.id == ext_id]
+    if len(extensions) == 0:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail=f"Unknown extension id: {ext_id}",
+        )
+
+    # check that other extensions do not depend on this one
+    for valid_ext_id in list(map(lambda e: e.code, get_valid_extensions())):
+        installed_ext = next(
+            (ext for ext in installable_extensions if ext.id == valid_ext_id), None
+        )
+        if installed_ext and ext_id in installed_ext.dependencies:
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail=(
+                    f"Cannot uninstall. Extension '{installed_ext.name}' "
+                    "depends on this one."
+                ),
+            )
+
+    try:
+        # call stop while the old routes are still active
+        await stop_extension_background_work(ext_id, user.id)
+
+        if ext_id not in settings.lnbits_deactivated_extensions:
+            settings.lnbits_deactivated_extensions += [ext_id]
+
+        for ext_info in extensions:
+            ext_info.clean_extension_files()
+            await delete_installed_extension(ext_id=ext_info.id)
+
+        logger.success(f"Extension '{ext_id}' uninstalled.")
+    except Exception as ex:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
+        )
+
+
+@api_router.get(
+    "/api/v1/extension/{ext_id}/releases", dependencies=[Depends(check_admin)]
+)
+async def get_extension_releases(ext_id: str):
+    try:
+        extension_releases: List[
+            ExtensionRelease
+        ] = await InstallableExtension.get_extension_releases(ext_id)
+
+        return extension_releases
+
+    except Exception as ex:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
+        )
+
+
+@api_router.get(
+    "/api/v1/extension/release/{org}/{repo}/{tag_name}",
+    dependencies=[Depends(check_admin)],
+)
+async def get_extension_release(org: str, repo: str, tag_name: str):
+    try:
+        config = await fetch_github_release_config(org, repo, tag_name)
+        if not config:
+            return {}
+
+        return {
+            "min_lnbits_version": config.min_lnbits_version,
+            "is_version_compatible": config.is_version_compatible(),
+            "warning": config.warning,
+        }
+    except Exception as ex:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
+        )
+
+
+@api_router.delete(
+    "/api/v1/extension/{ext_id}/db",
+    dependencies=[Depends(check_admin)],
+)
+async def delete_extension_db(ext_id: str):
+    try:
+        db_version = (await get_dbversions()).get(ext_id, None)
+        if not db_version:
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail=f"Unknown extension id: {ext_id}",
+            )
+        await drop_extension_db(ext_id=ext_id)
+        await delete_dbversion(ext_id=ext_id)
+        logger.success(f"Database removed for extension '{ext_id}'")
+    except HTTPException as ex:
+        logger.error(ex)
+        raise ex
+    except Exception as ex:
+        logger.error(ex)
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            detail=f"Cannot delete data for extension '{ext_id}'",
+        )
+
+
+@api_router.post(
+    "/api/v1/tinyurl",
+    name="Tinyurl",
+    description="creates a tinyurl",
+)
+async def api_create_tinyurl(
+    url: str, endless: bool = False, wallet: WalletTypeInfo = Depends(get_key_type)
+):
+    tinyurls = await get_tinyurl_by_url(url)
+    try:
+        for tinyurl in tinyurls:
+            if tinyurl:
+                if tinyurl.wallet == wallet.wallet.inkey:
+                    return tinyurl
+        return await create_tinyurl(url, endless, wallet.wallet.inkey)
+    except Exception:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST, detail="Unable to create tinyurl"
+        )
+
+
+@api_router.get(
+    "/api/v1/tinyurl/{tinyurl_id}",
+    name="Tinyurl",
+    description="get a tinyurl by id",
+)
+async def api_get_tinyurl(
+    tinyurl_id: str, wallet: WalletTypeInfo = Depends(get_key_type)
+):
+    try:
+        tinyurl = await get_tinyurl(tinyurl_id)
+        if tinyurl:
+            if tinyurl.wallet == wallet.wallet.inkey:
+                return tinyurl
+        raise HTTPException(
+            status_code=HTTPStatus.FORBIDDEN, detail="Wrong key provided."
+        )
+    except Exception:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Unable to fetch tinyurl"
+        )
+
+
+@api_router.delete(
+    "/api/v1/tinyurl/{tinyurl_id}",
+    name="Tinyurl",
+    description="delete a tinyurl by id",
+)
+async def api_delete_tinyurl(
+    tinyurl_id: str, wallet: WalletTypeInfo = Depends(get_key_type)
+):
+    try:
+        tinyurl = await get_tinyurl(tinyurl_id)
+        if tinyurl:
+            if tinyurl.wallet == wallet.wallet.inkey:
+                await delete_tinyurl(tinyurl_id)
+                return {"deleted": True}
+        raise HTTPException(
+            status_code=HTTPStatus.FORBIDDEN, detail="Wrong key provided."
+        )
+    except Exception:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST, detail="Unable to delete"
+        )
+
+
+@api_router.get(
+    "/t/{tinyurl_id}",
+    name="Tinyurl",
+    description="redirects a tinyurl by id",
+)
+async def api_tinyurl(tinyurl_id: str):
+    tinyurl = await get_tinyurl(tinyurl_id)
+    if tinyurl:
+        response = RedirectResponse(url=tinyurl.url)
+        return response
+    else:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="unable to find tinyurl"
+        )
+
+
+@api_router.post("/api/v1/webpush", status_code=HTTPStatus.CREATED)
+async def api_create_webpush_subscription(
+    request: Request,
+    data: CreateWebPushSubscription,
+    wallet: WalletTypeInfo = Depends(require_admin_key),
+) -> WebPushSubscription:
+    subscription = json.loads(data.subscription)
+    endpoint = subscription["endpoint"]
+    host = urlparse(str(request.url)).netloc
+
+    subscription = await get_webpush_subscription(endpoint, wallet.wallet.user)
+    if subscription:
+        return subscription
+    else:
+        return await create_webpush_subscription(
+            endpoint,
+            wallet.wallet.user,
+            data.subscription,
+            host,
+        )
+
+
+@api_router.delete("/api/v1/webpush", status_code=HTTPStatus.OK)
+async def api_delete_webpush_subscription(
+    request: Request,
+    wallet: WalletTypeInfo = Depends(require_admin_key),
+):
+    endpoint = unquote(
+        base64.b64decode(str(request.query_params.get("endpoint"))).decode("utf-8")
+    )
+    await delete_webpush_subscription(endpoint, wallet.wallet.user)
@@ -1,346 +0,0 @@
-import importlib
-from typing import Callable, Optional
-
-from fastapi import APIRouter, Depends, HTTPException, Request, status
-from fastapi.responses import JSONResponse, RedirectResponse
-from fastapi_sso.sso.base import OpenID, SSOBase
-from loguru import logger
-from starlette.status import (
-    HTTP_400_BAD_REQUEST,
-    HTTP_401_UNAUTHORIZED,
-    HTTP_403_FORBIDDEN,
-    HTTP_500_INTERNAL_SERVER_ERROR,
-)
-
-from lnbits.decorators import check_user_exists
-from lnbits.helpers import (
-    create_access_token,
-    decrypt_internal_message,
-    encrypt_internal_message,
-    is_valid_email_address,
-    is_valid_username,
-)
-from lnbits.settings import AuthMethods, settings
-
-from ..crud import (
-    create_account,
-    create_user,
-    get_account,
-    get_account_by_email,
-    get_account_by_username_or_email,
-    get_user,
-    update_account,
-    update_user_password,
-    verify_user_password,
-)
-from ..models import (
-    CreateUser,
-    LoginUsernamePassword,
-    LoginUsr,
-    UpdateSuperuserPassword,
-    UpdateUser,
-    UpdateUserPassword,
-    User,
-    UserConfig,
-)
-
-auth_router = APIRouter(prefix="/api/v1/auth", tags=["Auth"])
-
-
-@auth_router.get("", description="Get the authenticated user")
-async def get_auth_user(user: User = Depends(check_user_exists)) -> User:
-    return user
-
-
-@auth_router.post("", description="Login via the username and password")
-async def login(data: LoginUsernamePassword) -> JSONResponse:
-    if not settings.is_auth_method_allowed(AuthMethods.username_and_password):
-        raise HTTPException(
-            HTTP_401_UNAUTHORIZED, "Login by 'Username and Password' not allowed."
-        )
-
-    try:
-        user = await get_account_by_username_or_email(data.username)
-
-        if not user:
-            raise HTTPException(HTTP_401_UNAUTHORIZED, "Invalid credentials.")
-        if not await verify_user_password(user.id, data.password):
-            raise HTTPException(HTTP_401_UNAUTHORIZED, "Invalid credentials.")
-
-        return _auth_success_response(user.username, user.id)
-    except HTTPException as e:
-        raise e
-    except Exception as e:
-        logger.debug(e)
-        raise HTTPException(HTTP_500_INTERNAL_SERVER_ERROR, "Cannot login.")
-
-
-@auth_router.post("/usr", description="Login via the User ID")
-async def login_usr(data: LoginUsr) -> JSONResponse:
-    if not settings.is_auth_method_allowed(AuthMethods.user_id_only):
-        raise HTTPException(HTTP_401_UNAUTHORIZED, "Login by 'User ID' not allowed.")
-
-    try:
-        user = await get_user(data.usr)
-        if not user:
-            raise HTTPException(HTTP_401_UNAUTHORIZED, "User ID does not exist.")
-
-        return _auth_success_response(user.username or "", user.id)
-    except HTTPException as e:
-        raise e
-    except Exception as e:
-        logger.debug(e)
-        raise HTTPException(HTTP_500_INTERNAL_SERVER_ERROR, "Cannot login.")
-
-
-@auth_router.get("/{provider}", description="SSO Provider")
-async def login_with_sso_provider(
-    request: Request, provider: str, user_id: Optional[str] = None
-):
-    provider_sso = _new_sso(provider)
-    if not provider_sso:
-        raise HTTPException(
-            HTTP_401_UNAUTHORIZED, f"Login by '{provider}' not allowed."
-        )
-
-    provider_sso.redirect_uri = str(request.base_url) + f"api/v1/auth/{provider}/token"
-    with provider_sso:
-        state = encrypt_internal_message(user_id)
-        return await provider_sso.get_login_redirect(state=state)
-
-
-@auth_router.get("/{provider}/token", description="Handle OAuth callback")
-async def handle_oauth_token(request: Request, provider: str) -> RedirectResponse:
-    provider_sso = _new_sso(provider)
-    if not provider_sso:
-        raise HTTPException(
-            HTTP_401_UNAUTHORIZED, f"Login by '{provider}' not allowed."
-        )
-
-    try:
-        with provider_sso:
-            userinfo = await provider_sso.verify_and_process(request)
-            assert userinfo is not None
-            user_id = decrypt_internal_message(provider_sso.state)
-        request.session.pop("user", None)
-        return await _handle_sso_login(userinfo, user_id)
-    except HTTPException as e:
-        raise e
-    except ValueError as e:
-        raise HTTPException(HTTP_403_FORBIDDEN, str(e))
-    except Exception as e:
-        logger.debug(e)
-        raise HTTPException(
-            HTTP_500_INTERNAL_SERVER_ERROR,
-            f"Cannot authenticate user with {provider} Auth.",
-        )
-
-
-@auth_router.post("/logout")
-async def logout() -> JSONResponse:
-    response = JSONResponse({"status": "success"}, status_code=status.HTTP_200_OK)
-    response.delete_cookie("cookie_access_token")
-    response.delete_cookie("is_lnbits_user_authorized")
-    response.delete_cookie("is_access_token_expired")
-    response.delete_cookie("lnbits_last_active_wallet")
-
-    return response
-
-
-@auth_router.post("/register")
-async def register(data: CreateUser) -> JSONResponse:
-    if not settings.is_auth_method_allowed(AuthMethods.username_and_password):
-        raise HTTPException(
-            HTTP_401_UNAUTHORIZED, "Register by 'Username and Password' not allowed."
-        )
-
-    if data.password != data.password_repeat:
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Passwords do not match.")
-
-    if not data.username:
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Missing username.")
-    if not is_valid_username(data.username):
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Invalid username.")
-
-    if data.email and not is_valid_email_address(data.email):
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Invalid email.")
-
-    try:
-        user = await create_user(data)
-        return _auth_success_response(user.username)
-
-    except ValueError as e:
-        raise HTTPException(HTTP_403_FORBIDDEN, str(e))
-    except Exception as e:
-        logger.debug(e)
-        raise HTTPException(HTTP_500_INTERNAL_SERVER_ERROR, "Cannot create user.")
-
-
-@auth_router.put("/password")
-async def update_password(
-    data: UpdateUserPassword, user: User = Depends(check_user_exists)
-) -> Optional[User]:
-    if not settings.is_auth_method_allowed(AuthMethods.username_and_password):
-        raise HTTPException(
-            HTTP_401_UNAUTHORIZED, "Auth by 'Username and Password' not allowed."
-        )
-    if data.user_id != user.id:
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Invalid user ID.")
-
-    try:
-        return await update_user_password(data)
-    except AssertionError as e:
-        raise HTTPException(HTTP_403_FORBIDDEN, str(e))
-    except Exception as e:
-        logger.debug(e)
-        raise HTTPException(
-            HTTP_500_INTERNAL_SERVER_ERROR, "Cannot update user password."
-        )
-
-
-@auth_router.put("/update")
-async def update(
-    data: UpdateUser, user: User = Depends(check_user_exists)
-) -> Optional[User]:
-    if data.user_id != user.id:
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Invalid user ID.")
-    if data.username and not is_valid_username(data.username):
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Invalid username.")
-    if data.email != user.email:
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Email mismatch.")
-
-    try:
-        return await update_account(user.id, data.username, None, data.config)
-    except AssertionError as e:
-        raise HTTPException(HTTP_403_FORBIDDEN, str(e))
-    except Exception as e:
-        logger.debug(e)
-        raise HTTPException(HTTP_500_INTERNAL_SERVER_ERROR, "Cannot update user.")
-
-
-@auth_router.put("/first_install")
-async def first_install(data: UpdateSuperuserPassword) -> JSONResponse:
-    if not settings.first_install:
-        raise HTTPException(HTTP_401_UNAUTHORIZED, "This is not your first install")
-    try:
-        await update_account(
-            user_id=settings.super_user,
-            username=data.username,
-            user_config=UserConfig(provider="lnbits"),
-        )
-        super_user = UpdateUserPassword(
-            user_id=settings.super_user,
-            password=data.password,
-            password_repeat=data.password_repeat,
-            username=data.username,
-        )
-        await update_user_password(super_user)
-        settings.first_install = False
-        return _auth_success_response(username=super_user.username)
-    except AssertionError as e:
-        raise HTTPException(HTTP_403_FORBIDDEN, str(e))
-    except Exception as e:
-        logger.debug(e)
-        raise HTTPException(
-            HTTP_500_INTERNAL_SERVER_ERROR, "Cannot update user password."
-        )
-
-
-async def _handle_sso_login(userinfo: OpenID, verified_user_id: Optional[str] = None):
-    email = userinfo.email
-    if not email or not is_valid_email_address(email):
-        raise HTTPException(HTTP_400_BAD_REQUEST, "Invalid email.")
-
-    redirect_path = "/wallet"
-    user_config = UserConfig(**dict(userinfo))
-    user_config.email_verified = True
-
-    account = await get_account_by_email(email)
-
-    if verified_user_id:
-        if account:
-            raise HTTPException(HTTP_401_UNAUTHORIZED, "Email already used.")
-        account = await get_account(verified_user_id)
-        if not account:
-            raise HTTPException(HTTP_401_UNAUTHORIZED, "Cannot verify user email.")
-        redirect_path = "/account"
-
-    if account:
-        user = await update_account(account.id, email=email, user_config=user_config)
-    else:
-        if not settings.new_accounts_allowed:
-            raise HTTPException(HTTP_400_BAD_REQUEST, "Account creation is disabled.")
-        user = await create_account(email=email, user_config=user_config)
-
-    if not user:
-        raise HTTPException(HTTP_401_UNAUTHORIZED, "User not found.")
-
-    return _auth_redirect_response(redirect_path, email)
-
-
-def _auth_success_response(
-    username: Optional[str] = None,
-    user_id: Optional[str] = None,
-    email: Optional[str] = None,
-) -> JSONResponse:
-    access_token = create_access_token(
-        data={"sub": username or "", "usr": user_id, "email": email}
-    )
-    response = JSONResponse({"access_token": access_token, "token_type": "bearer"})
-    response.set_cookie("cookie_access_token", access_token, httponly=True)
-    response.set_cookie("is_lnbits_user_authorized", "true")
-    response.delete_cookie("is_access_token_expired")
-
-    return response
-
-
-def _auth_redirect_response(path: str, email: str) -> RedirectResponse:
-    access_token = create_access_token(data={"sub": "" or "", "email": email})
-    response = RedirectResponse(path)
-    response.set_cookie("cookie_access_token", access_token, httponly=True)
-    response.set_cookie("is_lnbits_user_authorized", "true")
-    response.delete_cookie("is_access_token_expired")
-    return response
-
-
-def _new_sso(provider: str) -> Optional[SSOBase]:
-    try:
-        if not settings.is_auth_method_allowed(AuthMethods(f"{provider}-auth")):
-            return None
-
-        client_id = getattr(settings, f"{provider}_client_id", None)
-        client_secret = getattr(settings, f"{provider}_client_secret", None)
-        discovery_url = getattr(settings, f"{provider}_discovery_url", None)
-
-        if not client_id or not client_secret:
-            logger.warning(f"{provider} auth allowed but not configured.")
-            return None
-
-        SSOProviderClass = _find_auth_provider_class(provider)
-        ssoProvider = SSOProviderClass(
-            client_id, client_secret, None, allow_insecure_http=True
-        )
-        if (
-            discovery_url
-            and getattr(ssoProvider, "discovery_url", discovery_url) != discovery_url
-        ):
-            ssoProvider.discovery_url = discovery_url
-        return ssoProvider
-    except Exception as e:
-        logger.warning(e)
-
-    return None
-
-
-def _find_auth_provider_class(provider: str) -> Callable:
-    sso_modules = ["lnbits.core.sso", "fastapi_sso.sso"]
-    for module in sso_modules:
-        try:
-            provider_module = importlib.import_module(f"{module}.{provider}")
-            ProviderClass = getattr(provider_module, f"{provider.title()}SSO")
-            if ProviderClass:
-                return ProviderClass
-        except Exception:
-            pass
-
-    raise ValueError(f"No SSO provider found for '{provider}'.")
@@ -1,271 +0,0 @@
-from typing import (
-    List,
-    Optional,
-)
-
-from bolt11 import decode as bolt11_decode
-from fastapi import (
-    APIRouter,
-    Depends,
-    HTTPException,
-)
-from fastapi import (
-    status as HTTPStatus,
-)
-from loguru import logger
-
-from lnbits.core.db import core_app_extra
-from lnbits.core.helpers import (
-    migrate_extension_database,
-    stop_extension_background_work,
-)
-from lnbits.core.models import (
-    User,
-)
-from lnbits.decorators import (
-    check_access_token,
-    check_admin,
-)
-from lnbits.extension_manager import (
-    CreateExtension,
-    Extension,
-    ExtensionRelease,
-    InstallableExtension,
-    fetch_github_release_config,
-    fetch_release_payment_info,
-    get_valid_extensions,
-)
-from lnbits.settings import settings
-
-from ..crud import (
-    add_installed_extension,
-    delete_dbversion,
-    delete_installed_extension,
-    drop_extension_db,
-    get_dbversions,
-    get_installed_extension,
-)
-
-extension_router = APIRouter(
-    tags=["Extension Managment"],
-    prefix="/api/v1/extension",
-)
-
-
-@extension_router.post("")
-async def api_install_extension(
-    data: CreateExtension,
-    user: User = Depends(check_admin),
-    access_token: Optional[str] = Depends(check_access_token),
-):
-    release = await InstallableExtension.get_extension_release(
-        data.ext_id, data.source_repo, data.archive, data.version
-    )
-    if not release:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Release not found"
-        )
-
-    if not release.is_version_compatible:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST, detail="Incompatible extension version"
-        )
-
-    release.payment_hash = data.payment_hash
-    ext_info = InstallableExtension(
-        id=data.ext_id, name=data.ext_id, installed_release=release, icon=release.icon
-    )
-
-    try:
-        installed_ext = await get_installed_extension(data.ext_id)
-        ext_info.payments = installed_ext.payments if installed_ext else []
-
-        await ext_info.download_archive()
-
-        ext_info.extract_archive()
-
-        extension = Extension.from_installable_ext(ext_info)
-
-        db_version = (await get_dbversions()).get(data.ext_id, 0)
-        await migrate_extension_database(extension, db_version)
-
-        await add_installed_extension(ext_info)
-
-        if extension.is_upgrade_extension:
-            # call stop while the old routes are still active
-            await stop_extension_background_work(data.ext_id, user.id, access_token)
-
-        if data.ext_id not in settings.lnbits_deactivated_extensions:
-            settings.lnbits_deactivated_extensions += [data.ext_id]
-
-        # mount routes for the new version
-        core_app_extra.register_new_ext_routes(extension)
-
-        if extension.upgrade_hash:
-            ext_info.notify_upgrade()
-
-        return extension
-    except AssertionError as e:
-        raise HTTPException(HTTPStatus.BAD_REQUEST, str(e))
-    except Exception as ex:
-        logger.warning(ex)
-        ext_info.clean_extension_files()
-        raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail=(
-                f"Failed to install extension {ext_info.id} "
-                f"({ext_info.installed_version})."
-            ),
-        )
-
-
-@extension_router.delete("/{ext_id}")
-async def api_uninstall_extension(
-    ext_id: str,
-    user: User = Depends(check_admin),
-    access_token: Optional[str] = Depends(check_access_token),
-):
-    installable_extensions = await InstallableExtension.get_installable_extensions()
-
-    extensions = [e for e in installable_extensions if e.id == ext_id]
-    if len(extensions) == 0:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
-            detail=f"Unknown extension id: {ext_id}",
-        )
-
-    # check that other extensions do not depend on this one
-    for valid_ext_id in [ext.code for ext in get_valid_extensions()]:
-        installed_ext = next(
-            (ext for ext in installable_extensions if ext.id == valid_ext_id), None
-        )
-        if installed_ext and ext_id in installed_ext.dependencies:
-            raise HTTPException(
-                status_code=HTTPStatus.BAD_REQUEST,
-                detail=(
-                    f"Cannot uninstall. Extension '{installed_ext.name}' "
-                    "depends on this one."
-                ),
-            )
-
-    try:
-        # call stop while the old routes are still active
-        await stop_extension_background_work(ext_id, user.id, access_token)
-
-        if ext_id not in settings.lnbits_deactivated_extensions:
-            settings.lnbits_deactivated_extensions += [ext_id]
-
-        for ext_info in extensions:
-            ext_info.clean_extension_files()
-            await delete_installed_extension(ext_id=ext_info.id)
-
-        logger.success(f"Extension '{ext_id}' uninstalled.")
-    except Exception as ex:
-        raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
-        )
-
-
-@extension_router.get("/{ext_id}/releases", dependencies=[Depends(check_admin)])
-async def get_extension_releases(ext_id: str):
-    try:
-        extension_releases: List[ExtensionRelease] = (
-            await InstallableExtension.get_extension_releases(ext_id)
-        )
-
-        installed_ext = await get_installed_extension(ext_id)
-        if not installed_ext:
-            return extension_releases
-
-        for release in extension_releases:
-            payment_info = installed_ext.find_existing_payment(release.pay_link)
-            if payment_info:
-                release.paid_sats = payment_info.amount
-
-        return extension_releases
-
-    except Exception as ex:
-        raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
-        )
-
-
-@extension_router.put("/invoice", dependencies=[Depends(check_admin)])
-async def get_extension_invoice(data: CreateExtension):
-    try:
-        assert data.cost_sats, "A non-zero amount must be specified"
-        release = await InstallableExtension.get_extension_release(
-            data.ext_id, data.source_repo, data.archive, data.version
-        )
-        assert release, "Release not found"
-        assert release.pay_link, "Pay link not found for release"
-
-        payment_info = await fetch_release_payment_info(
-            release.pay_link, data.cost_sats
-        )
-        assert payment_info and payment_info.payment_request, "Cannot request invoice"
-        invoice = bolt11_decode(payment_info.payment_request)
-
-        assert invoice.amount_msat is not None, "Invoic amount is missing"
-        invoice_amount = int(invoice.amount_msat / 1000)
-        assert (
-            invoice_amount == data.cost_sats
-        ), f"Wrong invoice amount: {invoice_amount}."
-        assert (
-            payment_info.payment_hash == invoice.payment_hash
-        ), "Wroong invoice payment hash"
-
-        return payment_info
-
-    except AssertionError as e:
-        raise HTTPException(HTTPStatus.BAD_REQUEST, str(e))
-    except Exception as ex:
-        logger.warning(ex)
-        raise HTTPException(HTTPStatus.INTERNAL_SERVER_ERROR, "Cannot request invoice")
-
-
-@extension_router.get(
-    "/release/{org}/{repo}/{tag_name}",
-    dependencies=[Depends(check_admin)],
-)
-async def get_extension_release(org: str, repo: str, tag_name: str):
-    try:
-        config = await fetch_github_release_config(org, repo, tag_name)
-        if not config:
-            return {}
-
-        return {
-            "min_lnbits_version": config.min_lnbits_version,
-            "is_version_compatible": config.is_version_compatible(),
-            "warning": config.warning,
-        }
-    except Exception as ex:
-        raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
-        )
-
-
-@extension_router.delete(
-    "/{ext_id}/db",
-    dependencies=[Depends(check_admin)],
-)
-async def delete_extension_db(ext_id: str):
-    try:
-        db_version = (await get_dbversions()).get(ext_id, None)
-        if not db_version:
-            raise HTTPException(
-                status_code=HTTPStatus.BAD_REQUEST,
-                detail=f"Unknown extension id: {ext_id}",
-            )
-        await drop_extension_db(ext_id=ext_id)
-        await delete_dbversion(ext_id=ext_id)
-        logger.success(f"Database removed for extension '{ext_id}'")
-    except HTTPException as ex:
-        logger.error(ex)
-        raise ex
-    except Exception as ex:
-        logger.error(ex)
-        raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail=f"Cannot delete data for extension '{ext_id}'",
-        )
@@ -1,18 +1,16 @@
 import asyncio
-import sys
 from http import HTTPStatus
-from pathlib import Path
-from typing import Annotated, List, Optional, Union
+from typing import List, Optional
 from urllib.parse import urlparse

-from fastapi import Cookie, Depends, Query, Request, status
+from fastapi import Depends, Query, Request, status
 from fastapi.exceptions import HTTPException
 from fastapi.responses import FileResponse, HTMLResponse, JSONResponse, RedirectResponse
 from fastapi.routing import APIRouter
 from loguru import logger
 from pydantic.types import UUID4

-from lnbits.core.db import core_app_extra, db
+from lnbits.core.db import db
 from lnbits.core.helpers import to_valid_user_id
 from lnbits.core.models import User
 from lnbits.decorators import check_admin, check_user_exists
@@ -21,7 +19,7 @@ from lnbits.settings import settings
 from lnbits.wallets import get_wallet_class

 from ...extension_manager import InstallableExtension, get_valid_extensions
-from ...utils.exchange_rates import allowed_currencies, currencies
+from ...utils.exchange_rates import currencies
 from ..crud import (
    create_account,
    create_wallet,
@@ -43,29 +41,13 @@ generic_router = APIRouter(

@generic_router.get("/favicon.ico", response_class=FileResponse)
 async def favicon():
-    return FileResponse(Path("lnbits", "static", "favicon.ico"))
+    return FileResponse("lnbits/core/static/favicon.ico")


@generic_router.get("/", response_class=HTMLResponse)
 async def home(request: Request, lightning: str = ""):
    return template_renderer().TemplateResponse(
-        request, "core/index.html", {"lnurl": lightning}
-    )
-
-
-@generic_router.get("/first_install", response_class=HTMLResponse)
-async def first_install(request: Request):
-    if not settings.first_install:
-        return template_renderer().TemplateResponse(
-            request,
-            "error.html",
-            {
-                "err": "Super user account has already been configured.",
-            },
-        )
-    return template_renderer().TemplateResponse(
-        request,
-        "core/first_install.html",
+        "core/index.html", {"request": request, "lnurl": lightning}
    )


@@ -91,14 +73,18 @@ async def extensions_install(
 ):
    await toggle_extension(enable, disable, user.id)

+    # Update user as his extensions have been updated
+    if enable or disable:
+        user = await get_user(user.id)  # type: ignore
    try:
        installed_exts: List["InstallableExtension"] = await get_installed_extensions()
        installed_exts_ids = [e.id for e in installed_exts]

-        installable_exts = await InstallableExtension.get_installable_extensions()
-        installable_exts_ids = [e.id for e in installable_exts]
+        installable_exts: List[
+            InstallableExtension
+        ] = await InstallableExtension.get_installable_extensions()
        installable_exts += [
-            e for e in installed_exts if e.id not in installable_exts_ids
+            e for e in installed_exts if e.id not in installed_exts_ids
        ]

        for e in installable_exts:
@@ -113,65 +99,55 @@ async def extensions_install(
    except Exception as ex:
        logger.warning(ex)
        installable_exts = []
-        installed_exts_ids = []

    try:
        ext_id = activate or deactivate
-        all_extensions = get_valid_extensions()
-        ext = next((e for e in all_extensions if e.code == ext_id), None)
        if ext_id and user.admin:
            if deactivate and deactivate not in settings.lnbits_deactivated_extensions:
                settings.lnbits_deactivated_extensions += [deactivate]
            elif activate:
-                # if extension never loaded (was deactivated on server startup)
-                if ext_id not in sys.modules.keys():
-                    # run extension start-up routine
-                    core_app_extra.register_new_ext_routes(ext)
-
                settings.lnbits_deactivated_extensions = list(
                    filter(
                        lambda e: e != activate, settings.lnbits_deactivated_extensions
                    )
                )
-
            await update_installed_extension_state(
                ext_id=ext_id, active=activate is not None
            )

-        all_ext_ids = [ext.code for ext in all_extensions]
+        all_extensions = list(map(lambda e: e.code, get_valid_extensions()))
        inactive_extensions = await get_inactive_extensions()
        db_version = await get_dbversions()
-        extensions = [
-            {
-                "id": ext.id,
-                "name": ext.name,
-                "icon": ext.icon,
-                "shortDescription": ext.short_description,
-                "stars": ext.stars,
-                "isFeatured": ext.featured,
-                "dependencies": ext.dependencies,
-                "isInstalled": ext.id in installed_exts_ids,
-                "hasDatabaseTables": ext.id in db_version,
-                "isAvailable": ext.id in all_ext_ids,
-                "isAdminOnly": ext.id in settings.lnbits_admin_extensions,
-                "isActive": ext.id not in inactive_extensions,
-                "latestRelease": (
-                    dict(ext.latest_release) if ext.latest_release else None
-                ),
-                "installedRelease": (
-                    dict(ext.installed_release) if ext.installed_release else None
-                ),
-            }
-            for ext in installable_exts
-        ]
-
-        # refresh user state. Eg: enabled extensions.
-        user = await get_user(user.id) or user
+        extensions = list(
+            map(
+                lambda ext: {
+                    "id": ext.id,
+                    "name": ext.name,
+                    "icon": ext.icon,
+                    "shortDescription": ext.short_description,
+                    "stars": ext.stars,
+                    "isFeatured": ext.featured,
+                    "dependencies": ext.dependencies,
+                    "isInstalled": ext.id in installed_exts_ids,
+                    "hasDatabaseTables": ext.id in db_version,
+                    "isAvailable": ext.id in all_extensions,
+                    "isAdminOnly": ext.id in settings.lnbits_admin_extensions,
+                    "isActive": ext.id not in inactive_extensions,
+                    "latestRelease": (
+                        dict(ext.latest_release) if ext.latest_release else None
+                    ),
+                    "installedRelease": (
+                        dict(ext.installed_release) if ext.installed_release else None
+                    ),
+                },
+                installable_exts,
+            )
+        )

        return template_renderer().TemplateResponse(
-            request,
            "core/extensions.html",
            {
+                "request": request,
                "user": user.dict(),
                "extensions": extensions,
            },
@@ -188,59 +164,58 @@ async def extensions_install(
 )
 async def wallet(
    request: Request,
-    lnbits_last_active_wallet: Annotated[Union[str, None], Cookie()] = None,
-    user: User = Depends(check_user_exists),
+    usr: UUID4 = Query(...),
    wal: Optional[UUID4] = Query(None),
 ):
-    if wal:
-        wallet_id = wal.hex
-    elif len(user.wallets) == 0:
-        wallet = await create_wallet(user_id=user.id)
-        user = await get_user(user_id=user.id) or user
-        wallet_id = wallet.id
-    elif lnbits_last_active_wallet and user.get_wallet(lnbits_last_active_wallet):
-        wallet_id = lnbits_last_active_wallet
-    else:
-        wallet_id = user.wallets[0].id
+    user_id = usr.hex
+    user = await get_user(user_id)

-    user_wallet = user.get_wallet(wallet_id)
-    if not user_wallet or user_wallet.deleted:
+    if not user:
        return template_renderer().TemplateResponse(
-            request, "error.html", {"err": "Wallet not found"}
+            "error.html", {"request": request, "err": "User does not exist."}
        )

-    resp = template_renderer().TemplateResponse(
-        request,
+    if not wal:
+        if len(user.wallets) == 0:
+            wallet = await create_wallet(user_id=user.id)
+            return RedirectResponse(url=f"/wallet?usr={user_id}&wal={wallet.id}")
+        return RedirectResponse(url=f"/wallet?usr={user_id}&wal={user.wallets[0].id}")
+    else:
+        wallet_id = wal.hex
+
+    userwallet = user.get_wallet(wallet_id)
+    if not userwallet or userwallet.deleted:
+        return template_renderer().TemplateResponse(
+            "error.html", {"request": request, "err": "Wallet not found"}
+        )
+
+    if (
+        len(settings.lnbits_allowed_users) > 0
+        and user_id not in settings.lnbits_allowed_users
+        and user_id not in settings.lnbits_admin_users
+        and user_id != settings.super_user
+    ):
+        return template_renderer().TemplateResponse(
+            "error.html", {"request": request, "err": "User not authorized."}
+        )
+
+    if user_id == settings.super_user or user_id in settings.lnbits_admin_users:
+        user.admin = True
+    if user_id == settings.super_user:
+        user.super_user = True
+
+    logger.debug(f"Access user {user.id} wallet {userwallet.name}")
+
+    return template_renderer().TemplateResponse(
        "core/wallet.html",
        {
+            "request": request,
            "user": user.dict(),
-            "wallet": user_wallet.dict(),
-            "currencies": allowed_currencies(),
+            "wallet": userwallet.dict(),
            "service_fee": settings.lnbits_service_fee,
-            "service_fee_max": settings.lnbits_service_fee_max,
            "web_manifest": f"/manifest/{user.id}.webmanifest",
        },
    )
-    resp.set_cookie("lnbits_last_active_wallet", wallet_id)
-    return resp
-
-
-@generic_router.get(
-    "/account",
-    response_class=HTMLResponse,
-    description="show account page",
-)
-async def account(
-    request: Request,
-    user: User = Depends(check_user_exists),
-):
-    return template_renderer().TemplateResponse(
-        request,
-        "core/account.html",
-        {
-            "user": user.dict(),
-        },
-    )


@generic_router.get("/withdraw", response_class=JSONResponse)
@@ -352,16 +327,9 @@ async def lnurlwallet(request: Request):
    )


-@generic_router.get("/service-worker.js")
-async def service_worker(request: Request):
-    return template_renderer().TemplateResponse(
-        request,
-        "service-worker.js",
-        {
-            "cache_version": settings.server_startup_time,
-        },
-        media_type="text/javascript",
-    )
+@generic_router.get("/service-worker.js", response_class=FileResponse)
+async def service_worker():
+    return FileResponse("lnbits/core/static/js/service-worker.js")


@generic_router.get("/manifest/{usr}.webmanifest")
@@ -380,46 +348,11 @@ async def manifest(request: Request, usr: str):
                "src": (
                    settings.lnbits_custom_logo
                    if settings.lnbits_custom_logo
-                    else "https://cdn.jsdelivr.net/gh/lnbits/lnbits@main/docs/logos/lnbits.png"
+                    else "https://cdn.jsdelivr.net/gh/lnbits/lnbits@0.3.0/docs/logos/lnbits.png"
                ),
-                "sizes": "512x512",
                "type": "image/png",
-            },
-            {"src": "/static/favicon.ico", "sizes": "32x32", "type": "image/x-icon"},
-            {
-                "src": "/static/images/maskable_icon_x192.png",
-                "type": "image/png",
-                "sizes": "192x192",
-                "purpose": "maskable",
-            },
-            {
-                "src": "/static/images/maskable_icon_x512.png",
-                "type": "image/png",
-                "sizes": "512x512",
-                "purpose": "maskable",
-            },
-            {
-                "src": "/static/images/maskable_icon.png",
-                "type": "image/png",
-                "sizes": "1024x1024",
-                "purpose": "maskable",
-            },
-        ],
-        "screenshots": [
-            {
-                "src": "/static/images/screenshot_desktop.png",
-                "sizes": "2394x1314",
-                "type": "image/png",
-                "form_factor": "wide",
-                "label": "LNbits - Desktop screenshot",
-            },
-            {
-                "src": "/static/images/screenshot_phone.png",
-                "sizes": "1080x1739",
-                "type": "image/png",
-                "form_factor": "narrow",
-                "label": "LNbits - Phone screenshot",
-            },
+                "sizes": "900x900",
+            }
        ],
        "start_url": f"/wallet?usr={usr}&wal={user.wallets[0].id}",
        "background_color": "#1F2234",
@@ -433,13 +366,6 @@ async def manifest(request: Request, usr: str):
                "short_name": wallet.name,
                "description": wallet.name,
                "url": f"/wallet?usr={usr}&wal={wallet.id}",
-                "icons": [
-                    {
-                        "src": "/static/images/maskable_icon_x96.png",
-                        "sizes": "96x96",
-                        "type": "image/png",
-                    }
-                ],
            }
            for wallet in user.wallets
        ],
@@ -456,9 +382,9 @@ async def node(request: Request, user: User = Depends(check_admin)):
    _, balance = await WALLET.status()

    return template_renderer().TemplateResponse(
-        request,
        "node/index.html",
        {
+            "request": request,
            "user": user.dict(),
            "settings": settings.dict(),
            "balance": balance,
@@ -476,9 +402,9 @@ async def node_public(request: Request):
    _, balance = await WALLET.status()

    return template_renderer().TemplateResponse(
-        request,
        "node/public.html",
        {
+            "request": request,
            "settings": settings.dict(),
            "balance": balance,
        },
@@ -494,9 +420,9 @@ async def index(request: Request, user: User = Depends(check_admin)):
    _, balance = await WALLET.status()

    return template_renderer().TemplateResponse(
-        request,
        "admin/index.html",
        {
+            "request": request,
            "user": user.dict(),
            "settings": settings.dict(),
            "balance": balance,
@@ -49,20 +49,12 @@ def check_public():
        )


-node_router = APIRouter(
-    tags=["Node Managment"],
-    prefix="/node/api/v1",
-    dependencies=[Depends(check_admin)],
-)
+node_router = APIRouter(prefix="/node/api/v1", dependencies=[Depends(check_admin)])
 super_node_router = APIRouter(
-    tags=["Node Managment"],
-    prefix="/node/api/v1",
-    dependencies=[Depends(check_super_user)],
+    prefix="/node/api/v1", dependencies=[Depends(check_super_user)]
 )
 public_node_router = APIRouter(
-    tags=["Node Managment"],
-    prefix="/node/public/api/v1",
-    dependencies=[Depends(check_public)],
+    prefix="/node/public/api/v1", dependencies=[Depends(check_public)]
 )


@@ -116,11 +108,9 @@ async def api_delete_channel(
 ) -> Optional[List[NodeChannel]]:
    return await node.close_channel(
        short_id,
-        (
-            ChannelPoint(funding_txid=funding_txid, output_index=output_index)
-            if funding_txid is not None and output_index is not None
-            else None
-        ),
+        ChannelPoint(funding_txid=funding_txid, output_index=output_index)
+        if funding_txid is not None and output_index is not None
+        else None,
        force,
    )

@@ -189,8 +179,7 @@ class NodeRank(BaseModel):
 )
 async def api_get_1ml_stats(node: Node = Depends(require_node)) -> Optional[NodeRank]:
    node_id = await node.get_id()
-    headers = {"User-Agent": settings.user_agent}
-    async with httpx.AsyncClient(headers=headers) as client:
+    async with httpx.AsyncClient() as client:
        r = await client.get(url=f"https://1ml.com/node/{node_id}/json", timeout=15)
        try:
            r.raise_for_status()
@@ -1,473 +0,0 @@
-import asyncio
-import json
-import uuid
-from http import HTTPStatus
-from math import ceil
-from typing import List, Optional, Union
-from urllib.parse import urlparse
-
-import httpx
-from fastapi import (
-    APIRouter,
-    Body,
-    Depends,
-    Header,
-    HTTPException,
-    Request,
-)
-from fastapi.responses import JSONResponse
-from loguru import logger
-from sse_starlette.sse import EventSourceResponse
-
-from lnbits import bolt11
-from lnbits.core.db import db
-from lnbits.core.models import (
-    CreateInvoice,
-    CreateLnurl,
-    DecodePayment,
-    Payment,
-    PaymentFilters,
-    PaymentHistoryPoint,
-    Query,
-    Wallet,
-    WalletType,
-)
-from lnbits.db import Filters, Page
-from lnbits.decorators import (
-    WalletTypeInfo,
-    get_key_type,
-    parse_filters,
-    require_admin_key,
-    require_invoice_key,
-)
-from lnbits.helpers import generate_filter_params_openapi, url_for
-from lnbits.lnurl import decode as lnurl_decode
-from lnbits.settings import settings
-from lnbits.utils.exchange_rates import fiat_amount_as_satoshis
-
-from ..crud import (
-    DateTrunc,
-    get_payments,
-    get_payments_history,
-    get_payments_paginated,
-    get_standalone_payment,
-    get_wallet_for_key,
-    save_balance_check,
-    update_pending_payments,
-)
-from ..services import (
-    InvoiceFailure,
-    PaymentFailure,
-    check_transaction_status,
-    create_invoice,
-    fee_reserve_total,
-    pay_invoice,
-)
-from ..tasks import api_invoice_listeners
-
-payment_router = APIRouter(prefix="/api/v1/payments", tags=["Payments"])
-
-
-@payment_router.get(
-    "",
-    name="Payment List",
-    summary="get list of payments",
-    response_description="list of payments",
-    response_model=List[Payment],
-    openapi_extra=generate_filter_params_openapi(PaymentFilters),
-)
-async def api_payments(
-    wallet: WalletTypeInfo = Depends(get_key_type),
-    filters: Filters = Depends(parse_filters(PaymentFilters)),
-):
-    await update_pending_payments(wallet.wallet.id)
-    return await get_payments(
-        wallet_id=wallet.wallet.id,
-        pending=True,
-        complete=True,
-        filters=filters,
-    )
-
-
-@payment_router.get(
-    "/history",
-    name="Get payments history",
-    response_model=List[PaymentHistoryPoint],
-    openapi_extra=generate_filter_params_openapi(PaymentFilters),
-)
-async def api_payments_history(
-    wallet: WalletTypeInfo = Depends(get_key_type),
-    group: DateTrunc = Query("day"),
-    filters: Filters[PaymentFilters] = Depends(parse_filters(PaymentFilters)),
-):
-    await update_pending_payments(wallet.wallet.id)
-    return await get_payments_history(wallet.wallet.id, group, filters)
-
-
-@payment_router.get(
-    "/paginated",
-    name="Payment List",
-    summary="get paginated list of payments",
-    response_description="list of payments",
-    response_model=Page[Payment],
-    openapi_extra=generate_filter_params_openapi(PaymentFilters),
-)
-async def api_payments_paginated(
-    wallet: WalletTypeInfo = Depends(get_key_type),
-    filters: Filters = Depends(parse_filters(PaymentFilters)),
-):
-    await update_pending_payments(wallet.wallet.id)
-    page = await get_payments_paginated(
-        wallet_id=wallet.wallet.id,
-        pending=True,
-        complete=True,
-        filters=filters,
-    )
-    return page
-
-
-async def api_payments_create_invoice(data: CreateInvoice, wallet: Wallet):
-    description_hash = b""
-    unhashed_description = b""
-    memo = data.memo or settings.lnbits_site_title
-    if data.description_hash or data.unhashed_description:
-        if data.description_hash:
-            try:
-                description_hash = bytes.fromhex(data.description_hash)
-            except ValueError:
-                raise HTTPException(
-                    status_code=HTTPStatus.BAD_REQUEST,
-                    detail="'description_hash' must be a valid hex string",
-                )
-        if data.unhashed_description:
-            try:
-                unhashed_description = bytes.fromhex(data.unhashed_description)
-            except ValueError:
-                raise HTTPException(
-                    status_code=HTTPStatus.BAD_REQUEST,
-                    detail="'unhashed_description' must be a valid hex string",
-                )
-        # do not save memo if description_hash or unhashed_description is set
-        memo = ""
-
-    async with db.connect() as conn:
-        try:
-            payment_hash, payment_request = await create_invoice(
-                wallet_id=wallet.id,
-                amount=data.amount,
-                memo=memo,
-                currency=data.unit,
-                description_hash=description_hash,
-                unhashed_description=unhashed_description,
-                expiry=data.expiry,
-                extra=data.extra,
-                webhook=data.webhook,
-                internal=data.internal,
-                conn=conn,
-            )
-            # NOTE: we get the checking_id with a seperate query because create_invoice
-            # does not return it and it would be a big hustle to change its return type
-            # (used across extensions)
-            payment_db = await get_standalone_payment(payment_hash, conn=conn)
-            assert payment_db is not None, "payment not found"
-            checking_id = payment_db.checking_id
-        except InvoiceFailure as e:
-            raise HTTPException(status_code=520, detail=str(e))
-        except Exception as exc:
-            raise exc
-
-    invoice = bolt11.decode(payment_request)
-
-    lnurl_response: Union[None, bool, str] = None
-    if data.lnurl_callback:
-        if data.lnurl_balance_check is not None:
-            await save_balance_check(wallet.id, data.lnurl_balance_check)
-
-        headers = {"User-Agent": settings.user_agent}
-        async with httpx.AsyncClient(headers=headers) as client:
-            try:
-                r = await client.get(
-                    data.lnurl_callback,
-                    params={
-                        "pr": payment_request,
-                        "balanceNotify": url_for(
-                            f"/withdraw/notify/{urlparse(data.lnurl_callback).netloc}",
-                            external=True,
-                            wal=wallet.id,
-                        ),
-                    },
-                    timeout=10,
-                )
-                if r.is_error:
-                    lnurl_response = r.text
-                else:
-                    resp = json.loads(r.text)
-                    if resp["status"] != "OK":
-                        lnurl_response = resp["reason"]
-                    else:
-                        lnurl_response = True
-            except (httpx.ConnectError, httpx.RequestError) as ex:
-                logger.error(ex)
-                lnurl_response = False
-
-    return {
-        "payment_hash": invoice.payment_hash,
-        "payment_request": payment_request,
-        # maintain backwards compatibility with API clients:
-        "checking_id": checking_id,
-        "lnurl_response": lnurl_response,
-    }
-
-
-async def api_payments_pay_invoice(
-    bolt11: str, wallet: Wallet, extra: Optional[dict] = None
-):
-    try:
-        payment_hash = await pay_invoice(
-            wallet_id=wallet.id, payment_request=bolt11, extra=extra
-        )
-    except ValueError as e:
-        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST, detail=str(e))
-    except PermissionError as e:
-        raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail=str(e))
-    except PaymentFailure as e:
-        raise HTTPException(status_code=520, detail=str(e))
-    except Exception as exc:
-        raise exc
-
-    return {
-        "payment_hash": payment_hash,
-        # maintain backwards compatibility with API clients:
-        "checking_id": payment_hash,
-    }
-
-
-@payment_router.post(
-    "",
-    summary="Create or pay an invoice",
-    description="""
-        This endpoint can be used both to generate and pay a BOLT11 invoice.
-        To generate a new invoice for receiving funds into the authorized account,
-        specify at least the first four fields in the POST body: `out: false`,
-        `amount`, `unit`, and `memo`. To pay an arbitrary invoice from the funds
-        already in the authorized account, specify `out: true` and use the `bolt11`
-        field to supply the BOLT11 invoice to be paid.
-    """,
-    status_code=HTTPStatus.CREATED,
-)
-async def api_payments_create(
-    wallet: WalletTypeInfo = Depends(require_invoice_key),
-    invoiceData: CreateInvoice = Body(...),
-):
-    if invoiceData.out is True and wallet.wallet_type == WalletType.admin:
-        if not invoiceData.bolt11:
-            raise HTTPException(
-                status_code=HTTPStatus.BAD_REQUEST,
-                detail="BOLT11 string is invalid or not given",
-            )
-        return await api_payments_pay_invoice(
-            invoiceData.bolt11, wallet.wallet, invoiceData.extra
-        )  # admin key
-    elif not invoiceData.out:
-        # invoice key
-        return await api_payments_create_invoice(invoiceData, wallet.wallet)
-    else:
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED,
-            detail="Invoice (or Admin) key required.",
-        )
-
-
-@payment_router.get("/fee-reserve")
-async def api_payments_fee_reserve(invoice: str = Query("invoice")) -> JSONResponse:
-    invoice_obj = bolt11.decode(invoice)
-    if invoice_obj.amount_msat:
-        response = {
-            "fee_reserve": fee_reserve_total(invoice_obj.amount_msat),
-        }
-        return JSONResponse(response)
-    else:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
-            detail="Invoice has no amount.",
-        )
-
-
-@payment_router.post("/lnurl")
-async def api_payments_pay_lnurl(
-    data: CreateLnurl, wallet: WalletTypeInfo = Depends(require_admin_key)
-):
-    domain = urlparse(data.callback).netloc
-
-    headers = {"User-Agent": settings.user_agent}
-    async with httpx.AsyncClient(headers=headers, follow_redirects=True) as client:
-        try:
-            if data.unit and data.unit != "sat":
-                amount_msat = await fiat_amount_as_satoshis(data.amount, data.unit)
-                # no msat precision
-                amount_msat = ceil(amount_msat // 1000) * 1000
-            else:
-                amount_msat = data.amount
-            r = await client.get(
-                data.callback,
-                params={"amount": amount_msat, "comment": data.comment},
-                timeout=40,
-            )
-            if r.is_error:
-                raise httpx.ConnectError("LNURL callback connection error")
-            r.raise_for_status()
-        except (httpx.ConnectError, httpx.RequestError):
-            raise HTTPException(
-                status_code=HTTPStatus.BAD_REQUEST,
-                detail=f"Failed to connect to {domain}.",
-            )
-
-    params = json.loads(r.text)
-    if params.get("status") == "ERROR":
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
-            detail=f"{domain} said: '{params.get('reason', '')}'",
-        )
-
-    if not params.get("pr"):
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
-            detail=f"{domain} did not return a payment request.",
-        )
-
-    invoice = bolt11.decode(params["pr"])
-    if invoice.amount_msat != amount_msat:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
-            detail=(
-                (
-                    f"{domain} returned an invalid invoice. Expected"
-                    f" {amount_msat} msat, got {invoice.amount_msat}."
-                ),
-            ),
-        )
-
-    extra = {}
-
-    if params.get("successAction"):
-        extra["success_action"] = params["successAction"]
-    if data.comment:
-        extra["comment"] = data.comment
-    if data.unit and data.unit != "sat":
-        extra["fiat_currency"] = data.unit
-        extra["fiat_amount"] = data.amount / 1000
-    assert data.description is not None, "description is required"
-    payment_hash = await pay_invoice(
-        wallet_id=wallet.wallet.id,
-        payment_request=params["pr"],
-        description=data.description,
-        extra=extra,
-    )
-
-    return {
-        "success_action": params.get("successAction"),
-        "payment_hash": payment_hash,
-        # maintain backwards compatibility with API clients:
-        "checking_id": payment_hash,
-    }
-
-
-async def subscribe_wallet_invoices(request: Request, wallet: Wallet):
-    """
-    Subscribe to new invoices for a wallet. Can be wrapped in EventSourceResponse.
-    Listenes invoming payments for a wallet and yields jsons with payment details.
-    """
-    this_wallet_id = wallet.id
-
-    payment_queue: asyncio.Queue[Payment] = asyncio.Queue(0)
-
-    uid = f"{this_wallet_id}_{str(uuid.uuid4())[:8]}"
-    logger.debug(f"adding sse listener for wallet: {uid}")
-    api_invoice_listeners[uid] = payment_queue
-
-    try:
-        while True:
-            if await request.is_disconnected():
-                await request.close()
-                break
-            payment: Payment = await payment_queue.get()
-            if payment.wallet_id == this_wallet_id:
-                logger.debug("sse listener: payment received", payment)
-                yield {"data": payment.json(), "event": "payment-received"}
-    except asyncio.CancelledError:
-        logger.debug(f"removing listener for wallet {uid}")
-    except Exception as exc:
-        logger.error(f"Error in sse: {exc}")
-    finally:
-        api_invoice_listeners.pop(uid)
-
-
-@payment_router.get("/sse")
-async def api_payments_sse(
-    request: Request, wallet: WalletTypeInfo = Depends(get_key_type)
-):
-    return EventSourceResponse(
-        subscribe_wallet_invoices(request, wallet.wallet),
-        ping=20,
-        media_type="text/event-stream",
-    )
-
-
-# TODO: refactor this route into a public and admin one
-@payment_router.get("/{payment_hash}")
-async def api_payment(payment_hash, X_Api_Key: Optional[str] = Header(None)):
-    # We use X_Api_Key here because we want this call to work with and without keys
-    # If a valid key is given, we also return the field "details", otherwise not
-    wallet = await get_wallet_for_key(X_Api_Key) if isinstance(X_Api_Key, str) else None
-
-    payment = await get_standalone_payment(
-        payment_hash, wallet_id=wallet.id if wallet else None
-    )
-    if payment is None:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Payment does not exist."
-        )
-    await check_transaction_status(payment.wallet_id, payment_hash)
-    payment = await get_standalone_payment(
-        payment_hash, wallet_id=wallet.id if wallet else None
-    )
-    if not payment:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Payment does not exist."
-        )
-    elif not payment.pending:
-        if wallet and wallet.id == payment.wallet_id:
-            return {"paid": True, "preimage": payment.preimage, "details": payment}
-        return {"paid": True, "preimage": payment.preimage}
-
-    try:
-        await payment.check_status()
-    except Exception:
-        if wallet and wallet.id == payment.wallet_id:
-            return {"paid": False, "details": payment}
-        return {"paid": False}
-
-    if wallet and wallet.id == payment.wallet_id:
-        return {
-            "paid": not payment.pending,
-            "preimage": payment.preimage,
-            "details": payment,
-        }
-    return {"paid": not payment.pending, "preimage": payment.preimage}
-
-
-@payment_router.post("/decode", status_code=HTTPStatus.OK)
-async def api_payments_decode(data: DecodePayment) -> JSONResponse:
-    payment_str = data.data
-    try:
-        if payment_str[:5] == "LNURL":
-            url = str(lnurl_decode(payment_str))
-            return JSONResponse({"domain": url})
-        else:
-            invoice = bolt11.decode(payment_str)
-            return JSONResponse(invoice.data)
-    except Exception as exc:
-        return JSONResponse(
-            {"message": f"Failed to decode: {str(exc)}"},
-            status_code=HTTPStatus.BAD_REQUEST,
-        )
@@ -9,7 +9,7 @@ from lnbits import bolt11
 from ..crud import get_standalone_payment
 from ..tasks import api_invoice_listeners

-public_router = APIRouter(tags=["Core"])
+public_router = APIRouter()


@public_router.get("/public/v1/payment/{payment_hash}")
@@ -1,105 +0,0 @@
-from http import HTTPStatus
-
-from fastapi import (
-    APIRouter,
-    Depends,
-    HTTPException,
-)
-from starlette.responses import RedirectResponse
-
-from lnbits.decorators import (
-    WalletTypeInfo,
-    require_admin_key,
-    require_invoice_key,
-)
-
-from ..crud import (
-    create_tinyurl,
-    delete_tinyurl,
-    get_tinyurl,
-    get_tinyurl_by_url,
-)
-
-tinyurl_router = APIRouter(tags=["Tinyurl"])
-
-
-@tinyurl_router.post(
-    "/api/v1/tinyurl",
-    name="Tinyurl",
-    description="creates a tinyurl",
-)
-async def api_create_tinyurl(
-    url: str, endless: bool = False, wallet: WalletTypeInfo = Depends(require_admin_key)
-):
-    tinyurls = await get_tinyurl_by_url(url)
-    try:
-        for tinyurl in tinyurls:
-            if tinyurl:
-                if tinyurl.wallet == wallet.wallet.id:
-                    return tinyurl
-        return await create_tinyurl(url, endless, wallet.wallet.id)
-    except Exception:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST, detail="Unable to create tinyurl"
-        )
-
-
-@tinyurl_router.get(
-    "/api/v1/tinyurl/{tinyurl_id}",
-    name="Tinyurl",
-    description="get a tinyurl by id",
-)
-async def api_get_tinyurl(
-    tinyurl_id: str, wallet: WalletTypeInfo = Depends(require_invoice_key)
-):
-    try:
-        tinyurl = await get_tinyurl(tinyurl_id)
-        if tinyurl:
-            if tinyurl.wallet == wallet.wallet.id:
-                return tinyurl
-        raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN, detail="Wrong key provided."
-        )
-    except Exception:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Unable to fetch tinyurl"
-        )
-
-
-@tinyurl_router.delete(
-    "/api/v1/tinyurl/{tinyurl_id}",
-    name="Tinyurl",
-    description="delete a tinyurl by id",
-)
-async def api_delete_tinyurl(
-    tinyurl_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)
-):
-    try:
-        tinyurl = await get_tinyurl(tinyurl_id)
-        if tinyurl:
-            if tinyurl.wallet == wallet.wallet.id:
-                await delete_tinyurl(tinyurl_id)
-                return {"deleted": True}
-        raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN, detail="Wrong key provided."
-        )
-    except Exception:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST, detail="Unable to delete"
-        )
-
-
-@tinyurl_router.get(
-    "/t/{tinyurl_id}",
-    name="Tinyurl",
-    description="redirects a tinyurl by id",
-)
-async def api_tinyurl(tinyurl_id: str):
-    tinyurl = await get_tinyurl(tinyurl_id)
-    if tinyurl:
-        response = RedirectResponse(url=tinyurl.url)
-        return response
-    else:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="unable to find tinyurl"
-        )
@@ -1,77 +0,0 @@
-from typing import Optional
-
-from fastapi import (
-    APIRouter,
-    Body,
-    Depends,
-)
-
-from lnbits.core.models import (
-    CreateWallet,
-    Wallet,
-    WalletType,
-)
-from lnbits.decorators import (
-    WalletTypeInfo,
-    get_key_type,
-    require_admin_key,
-)
-
-from ..crud import (
-    create_wallet,
-    delete_wallet,
-    update_wallet,
-)
-
-wallet_router = APIRouter(prefix="/api/v1/wallet", tags=["Wallet"])
-
-
-@wallet_router.get("")
-async def api_wallet(wallet: WalletTypeInfo = Depends(get_key_type)):
-    if wallet.wallet_type == WalletType.admin:
-        return {
-            "id": wallet.wallet.id,
-            "name": wallet.wallet.name,
-            "balance": wallet.wallet.balance_msat,
-        }
-    else:
-        return {"name": wallet.wallet.name, "balance": wallet.wallet.balance_msat}
-
-
-@wallet_router.put("/{new_name}")
-async def api_update_wallet_name(
-    new_name: str, wallet: WalletTypeInfo = Depends(require_admin_key)
-):
-    await update_wallet(wallet.wallet.id, new_name)
-    return {
-        "id": wallet.wallet.id,
-        "name": wallet.wallet.name,
-        "balance": wallet.wallet.balance_msat,
-    }
-
-
-@wallet_router.patch("", response_model=Wallet)
-async def api_update_wallet(
-    name: Optional[str] = Body(None),
-    currency: Optional[str] = Body(None),
-    wallet: WalletTypeInfo = Depends(require_admin_key),
-):
-    return await update_wallet(wallet.wallet.id, name, currency)
-
-
-@wallet_router.delete("")
-async def api_delete_wallet(
-    wallet: WalletTypeInfo = Depends(require_admin_key),
-) -> None:
-    await delete_wallet(
-        user_id=wallet.wallet.user,
-        wallet_id=wallet.wallet.id,
-    )
-
-
-@wallet_router.post("", response_model=Wallet)
-async def api_create_wallet(
-    data: CreateWallet,
-    wallet: WalletTypeInfo = Depends(require_admin_key),
-) -> Wallet:
-    return await create_wallet(user_id=wallet.wallet.user, wallet_name=data.name)
@@ -1,60 +0,0 @@
-import base64
-import json
-from http import HTTPStatus
-from urllib.parse import unquote, urlparse
-
-from fastapi import (
-    APIRouter,
-    Depends,
-    Request,
-)
-
-from lnbits.core.models import (
-    CreateWebPushSubscription,
-    WebPushSubscription,
-)
-from lnbits.decorators import (
-    WalletTypeInfo,
-    require_admin_key,
-)
-
-from ..crud import (
-    create_webpush_subscription,
-    delete_webpush_subscription,
-    get_webpush_subscription,
-)
-
-webpush_router = APIRouter(prefix="/api/v1/webpush", tags=["Webpush"])
-
-
-@webpush_router.post("", status_code=HTTPStatus.CREATED)
-async def api_create_webpush_subscription(
-    request: Request,
-    data: CreateWebPushSubscription,
-    wallet: WalletTypeInfo = Depends(require_admin_key),
-) -> WebPushSubscription:
-    subscription = json.loads(data.subscription)
-    endpoint = subscription["endpoint"]
-    host = urlparse(str(request.url)).netloc
-
-    subscription = await get_webpush_subscription(endpoint, wallet.wallet.user)
-    if subscription:
-        return subscription
-    else:
-        return await create_webpush_subscription(
-            endpoint,
-            wallet.wallet.user,
-            data.subscription,
-            host,
-        )
-
-
-@webpush_router.delete("", status_code=HTTPStatus.OK)
-async def api_delete_webpush_subscription(
-    request: Request,
-    wallet: WalletTypeInfo = Depends(require_admin_key),
-):
-    endpoint = unquote(
-        base64.b64decode(str(request.query_params.get("endpoint"))).decode("utf-8")
-    )
-    await delete_webpush_subscription(endpoint, wallet.wallet.user)
@@ -1,40 +0,0 @@
-from fastapi import (
-    APIRouter,
-    WebSocket,
-    WebSocketDisconnect,
-)
-
-from ..services import (
-    websocketManager,
-    websocketUpdater,
-)
-
-websocket_router = APIRouter(prefix="/api/v1/ws", tags=["Websocket"])
-
-
-@websocket_router.websocket("/{item_id}")
-async def websocket_connect(websocket: WebSocket, item_id: str):
-    await websocketManager.connect(websocket, item_id)
-    try:
-        while True:
-            await websocket.receive_text()
-    except WebSocketDisconnect:
-        websocketManager.disconnect(websocket)
-
-
-@websocket_router.post("/{item_id}")
-async def websocket_update_post(item_id: str, data: str):
-    try:
-        await websocketUpdater(item_id, data)
-        return {"sent": True, "data": data}
-    except Exception:
-        return {"sent": False, "data": data}
-
-
-@websocket_router.get("/{item_id}/{data}")
-async def websocket_update_get(item_id: str, data: str):
-    try:
-        await websocketUpdater(item_id, data)
-        return {"sent": True, "data": data}
-    except Exception:
-        return {"sent": False, "data": data}
@@ -91,12 +91,6 @@ class Compat:
            return "(strftime('%s', 'now'))"
        return "<nothing>"

-    @property
-    def timestamp_column_default(self) -> str:
-        if self.type in {POSTGRES, COCKROACH}:
-            return self.timestamp_now
-        return "NULL"
-
    @property
    def serial_primary_key(self) -> str:
        if self.type in {POSTGRES, COCKROACH}:
@@ -179,27 +173,16 @@ class Connection(Compat):
        values: Optional[List[str]] = None,
        filters: Optional[Filters] = None,
        model: Optional[Type[TRowModel]] = None,
-        group_by: Optional[List[str]] = None,
    ) -> Page[TRowModel]:
        if not filters:
            filters = Filters()
        clause = filters.where(where)
        parsed_values = filters.values(values)

-        group_by_string = ""
-        if group_by:
-            for field in group_by:
-                if not re.fullmatch(
-                    r"[a-zA-Z_][a-zA-Z0-9_]*(\.[a-zA-Z_][a-zA-Z0-9_]*)?", field
-                ):
-                    raise ValueError("Value for GROUP BY is invalid")
-            group_by_string = f"GROUP BY {', '.join(group_by)}"
-
        rows = await self.fetchall(
            f"""
            {query}
            {clause}
-            {group_by_string}
            {filters.order_by()}
            {filters.pagination()}
            """,
@@ -213,7 +196,6 @@ class Connection(Compat):
                    SELECT COUNT(*) FROM (
                        {query}
                        {clause}
-                        {group_by_string}
                    ) as count
                    """,
                    parsed_values,
@@ -254,9 +236,7 @@ class Database(Compat):
        else:
            self.schema = None

-        self.engine = create_engine(
-            database_uri, strategy=ASYNCIO_STRATEGY, echo=settings.debug_database
-        )
+        self.engine = create_engine(database_uri, strategy=ASYNCIO_STRATEGY)
        self.lock = asyncio.Lock()

        logger.trace(f"database {self.type} added for {self.name}")
@@ -302,10 +282,9 @@ class Database(Compat):
        values: Optional[List[str]] = None,
        filters: Optional[Filters] = None,
        model: Optional[Type[TRowModel]] = None,
-        group_by: Optional[List[str]] = None,
    ) -> Page[TRowModel]:
        async with self.connect() as conn:
-            return await conn.fetch_page(query, where, values, filters, model, group_by)
+            return await conn.fetch_page(query, where, values, filters, model)

    async def execute(self, query: str, values: tuple = ()):
        async with self.connect() as conn:
@@ -478,8 +457,8 @@ class Filters(BaseModel, Generic[TFilterModel]):
        if not where_stmts:
            where_stmts = []
        if self.filters:
-            for page_filter in self.filters:
-                where_stmts.append(page_filter.statement)
+            for filter in self.filters:
+                where_stmts.append(filter.statement)
        if self.search and self.model:
            if DB_TYPE == POSTGRES:
                where_stmts.append(
@@ -502,8 +481,8 @@ class Filters(BaseModel, Generic[TFilterModel]):
        if not values:
            values = []
        if self.filters:
-            for page_filter in self.filters:
-                values.extend(page_filter.values)
+            for filter in self.filters:
+                values.extend(filter.values)
        if self.search and self.model:
            values.append(f"%{self.search}%")
        return tuple(values)
@@ -1,29 +1,21 @@
 from http import HTTPStatus
-from typing import Annotated, Literal, Optional, Type, Union
+from typing import Literal, Optional, Type

-from fastapi import Cookie, Depends, Query, Request, Security
+from fastapi import Query, Request, Security
 from fastapi.exceptions import HTTPException
-from fastapi.openapi.models import APIKey, APIKeyIn, SecuritySchemeType
-from fastapi.security import APIKeyHeader, APIKeyQuery, OAuth2PasswordBearer
+from fastapi.openapi.models import APIKey, APIKeyIn
+from fastapi.security import APIKeyHeader, APIKeyQuery
 from fastapi.security.base import SecurityBase
-from jose import ExpiredSignatureError, JWTError, jwt
-from loguru import logger
 from pydantic.types import UUID4

-from lnbits.core.crud import (
-    get_account,
-    get_account_by_email,
-    get_account_by_username,
-    get_user,
-    get_wallet_for_key,
-)
-from lnbits.core.models import User, Wallet, WalletType, WalletTypeInfo
+from lnbits.core.crud import get_user, get_wallet_for_key
+from lnbits.core.models import User, WalletType, WalletTypeInfo
 from lnbits.db import Filter, Filters, TFilterModel
-from lnbits.settings import AuthMethods, settings
-
-oauth2_scheme = OAuth2PasswordBearer(tokenUrl="api/v1/auth", auto_error=False)
+from lnbits.requestvars import g
+from lnbits.settings import settings


+# TODO: fix type ignores
 class KeyChecker(SecurityBase):
    def __init__(
        self,
@@ -32,25 +24,23 @@ class KeyChecker(SecurityBase):
        api_key: Optional[str] = None,
    ):
        self.scheme_name = scheme_name or self.__class__.__name__
-        self.auto_error: bool = auto_error
-        self._key_type: WalletType = WalletType.invoice
+        self.auto_error = auto_error
+        self._key_type = WalletType.invoice
        self._api_key = api_key
        if api_key:
-            openapi_model = APIKey(
-                **{"in": APIKeyIn.query},
-                type=SecuritySchemeType.apiKey,
+            key = APIKey(
+                **{"in": APIKeyIn.query},  # type: ignore
                name="X-API-KEY",
                description="Wallet API Key - QUERY",
            )
        else:
-            openapi_model = APIKey(
-                **{"in": APIKeyIn.header},
-                type=SecuritySchemeType.apiKey,
+            key = APIKey(
+                **{"in": APIKeyIn.header},  # type: ignore
                name="X-API-KEY",
                description="Wallet API Key - HEADER",
            )
-        self.wallet: Optional[Wallet] = None
-        self.model: APIKey = openapi_model
+        self.wallet = None
+        self.model: APIKey = key

    async def __call__(self, request: Request):
        try:
@@ -63,12 +53,12 @@ class KeyChecker(SecurityBase):
            #        avoided here. Also, we should not return the wallet here - thats
            #        silly. Possibly store it in a Redis DB
            wallet = await get_wallet_for_key(key_value, self._key_type)
-            if not wallet:
+            if not wallet or wallet.deleted:
                raise HTTPException(
                    status_code=HTTPStatus.UNAUTHORIZED,
                    detail="Invalid key or wallet.",
                )
-            self.wallet = wallet
+            self.wallet = wallet  # type: ignore
        except KeyError:
            raise HTTPException(
                status_code=HTTPStatus.BAD_REQUEST, detail="`X-API-KEY` header missing."
@@ -230,50 +220,44 @@ async def require_invoice_key(
        return wallet


-async def check_access_token(
-    header_access_token: Annotated[Union[str, None], Depends(oauth2_scheme)],
-    cookie_access_token: Annotated[Union[str, None], Cookie()] = None,
-) -> Optional[str]:
-    return header_access_token or cookie_access_token
+async def check_user_exists(usr: UUID4) -> User:
+    g().user = await get_user(usr.hex)
+
+    if not g().user:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="User does not exist."
+        )
+
+    if (
+        len(settings.lnbits_allowed_users) > 0
+        and g().user.id not in settings.lnbits_allowed_users
+        and g().user.id not in settings.lnbits_admin_users
+        and g().user.id != settings.super_user
+    ):
+        raise HTTPException(
+            status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."
+        )
+
+    return g().user


-async def check_user_exists(
-    r: Request,
-    access_token: Annotated[Optional[str], Depends(check_access_token)],
-    usr: Optional[UUID4] = None,
-) -> User:
-    if access_token:
-        account = await _get_account_from_token(access_token)
-    elif usr and settings.is_auth_method_allowed(AuthMethods.user_id_only):
-        account = await get_account(usr.hex)
-    else:
-        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Missing user ID or access token.")
-
-    if not account or not settings.is_user_allowed(account.id):
-        raise HTTPException(HTTPStatus.UNAUTHORIZED, "User not allowed.")
-
-    user = await get_user(account.id)
-    assert user, "User not found for account."
-
-    if not user.admin and r["path"].split("/")[1] in settings.lnbits_admin_extensions:
-        raise HTTPException(HTTPStatus.FORBIDDEN, "User not authorized for extension.")
-
-    return user
-
-
-async def check_admin(user: Annotated[User, Depends(check_user_exists)]) -> User:
+async def check_admin(usr: UUID4) -> User:
+    user = await check_user_exists(usr)
    if user.id != settings.super_user and user.id not in settings.lnbits_admin_users:
        raise HTTPException(
-            HTTPStatus.UNAUTHORIZED, "User not authorized. No admin privileges."
+            status_code=HTTPStatus.UNAUTHORIZED,
+            detail="User not authorized. No admin privileges.",
        )

    return user


-async def check_super_user(user: Annotated[User, Depends(check_user_exists)]) -> User:
+async def check_super_user(usr: UUID4) -> User:
+    user = await check_admin(usr)
    if user.id != settings.super_user:
        raise HTTPException(
-            HTTPStatus.UNAUTHORIZED, "User not authorized. No super user privileges."
+            status_code=HTTPStatus.UNAUTHORIZED,
+            detail="User not authorized. No super user privileges.",
        )
    return user

@@ -311,23 +295,3 @@ def parse_filters(model: Type[TFilterModel]):
        )

    return dependency
-
-
-async def _get_account_from_token(access_token):
-    try:
-        payload = jwt.decode(access_token, settings.auth_secret_key, "HS256")
-        if "sub" in payload and payload.get("sub"):
-            return await get_account_by_username(str(payload.get("sub")))
-        if "usr" in payload and payload.get("usr"):
-            return await get_account(str(payload.get("usr")))
-        if "email" in payload and payload.get("email"):
-            return await get_account_by_email(str(payload.get("email")))
-
-        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Data missing for access token.")
-    except ExpiredSignatureError:
-        raise HTTPException(
-            HTTPStatus.UNAUTHORIZED, "Session expired.", {"token-expired": "true"}
-        )
-    except JWTError as e:
-        logger.debug(e)
-        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid access token.")
@@ -1,15 +1,16 @@
-import asyncio
 import hashlib
 import json
 import os
 import shutil
 import sys
 import zipfile
+from http import HTTPStatus
 from pathlib import Path
 from typing import Any, List, NamedTuple, Optional, Tuple
 from urllib import request

 import httpx
+from fastapi import HTTPException
 from loguru import logger
 from packaging import version
 from pydantic import BaseModel
@@ -32,12 +33,11 @@ class ExplicitRelease(BaseModel):
    warning: Optional[str]
    info_notification: Optional[str]
    critical_notification: Optional[str]
-    pay_link: Optional[str]

    def is_version_compatible(self):
        if not self.min_lnbits_version:
            return True
-        return version_parse(self.min_lnbits_version) <= version_parse(settings.version)
+        return version.parse(self.min_lnbits_version) <= version.parse(settings.version)


 class GitHubRelease(BaseModel):
@@ -75,18 +75,11 @@ class ExtensionConfig(BaseModel):
    def is_version_compatible(self):
        if not self.min_lnbits_version:
            return True
-        return version_parse(self.min_lnbits_version) <= version_parse(settings.version)
-
-
-class ReleasePaymentInfo(BaseModel):
-    amount: Optional[int] = None
-    pay_link: Optional[str] = None
-    payment_hash: Optional[str] = None
-    payment_request: Optional[str] = None
+        return version.parse(self.min_lnbits_version) <= version.parse(settings.version)


 def download_url(url, save_path):
-    with request.urlopen(url, timeout=60) as dl_file:
+    with request.urlopen(url) as dl_file:
        with open(save_path, "wb") as out_file:
            out_file.write(dl_file.read())

@@ -151,32 +144,22 @@ async def fetch_github_release_config(


 async def github_api_get(url: str, error_msg: Optional[str]) -> Any:
-    headers = {"User-Agent": settings.user_agent}
-    if settings.lnbits_ext_github_token:
-        headers["Authorization"] = f"Bearer {settings.lnbits_ext_github_token}"
-    async with httpx.AsyncClient(headers=headers) as client:
-        resp = await client.get(url)
+    async with httpx.AsyncClient() as client:
+        headers = (
+            {"Authorization": "Bearer " + settings.lnbits_ext_github_token}
+            if settings.lnbits_ext_github_token
+            else None
+        )
+        resp = await client.get(
+            url,
+            headers=headers,
+        )
        if resp.status_code != 200:
            logger.warning(f"{error_msg} ({url}): {resp.text}")
        resp.raise_for_status()
        return resp.json()


-async def fetch_release_payment_info(
-    url: str, amount: Optional[int] = None
-) -> Optional[ReleasePaymentInfo]:
-    if amount:
-        url = f"{url}?amount={amount}"
-    try:
-        async with httpx.AsyncClient() as client:
-            resp = await client.get(url)
-            resp.raise_for_status()
-            return ReleasePaymentInfo(**resp.json())
-    except Exception as e:
-        logger.warning(e)
-        return None
-
-
 def icon_to_github_url(source_repo: str, path: Optional[str]) -> str:
    if not path:
        return ""
@@ -282,26 +265,6 @@ class ExtensionRelease(BaseModel):
    repo: Optional[str] = None
    icon: Optional[str] = None

-    pay_link: Optional[str] = None
-    cost_sats: Optional[int] = None
-    paid_sats: Optional[int] = 0
-    payment_hash: Optional[str] = None
-
-    @property
-    def archive_url(self) -> str:
-        if not self.pay_link:
-            return self.archive
-        return (
-            f"{self.archive}?version=v{self.version}&payment_hash={self.payment_hash}"
-        )
-
-    async def check_payment_requirements(self):
-        if not self.pay_link:
-            return
-
-        payment_info = await fetch_release_payment_info(self.pay_link)
-        self.cost_sats = payment_info.amount if payment_info else None
-
    @classmethod
    def from_github_release(
        cls, source_repo: str, r: "GitHubRepoRelease"
@@ -332,13 +295,12 @@ class ExtensionRelease(BaseModel):
            is_version_compatible=e.is_version_compatible(),
            warning=e.warning,
            html_url=e.html_url,
-            pay_link=e.pay_link,
            repo=e.repo,
            icon=e.icon,
        )

    @classmethod
-    async def get_github_releases(cls, org: str, repo: str) -> List["ExtensionRelease"]:
+    async def all_releases(cls, org: str, repo: str) -> List["ExtensionRelease"]:
        try:
            github_releases = await fetch_github_releases(org, repo)
            return [
@@ -361,7 +323,6 @@ class InstallableExtension(BaseModel):
    featured = False
    latest_release: Optional[ExtensionRelease] = None
    installed_release: Optional[ExtensionRelease] = None
-    payments: List[ReleasePaymentInfo] = []
    archive: Optional[str] = None

    @property
@@ -412,32 +373,30 @@ class InstallableExtension(BaseModel):
            return self.installed_release.version
        return ""

-    async def download_archive(self):
+    def download_archive(self):
        logger.info(f"Downloading extension {self.name} ({self.installed_version}).")
        ext_zip_file = self.zip_path
        if ext_zip_file.is_file():
            os.remove(ext_zip_file)
        try:
            assert self.installed_release, "installed_release is none."
-
-            self._restore_payment_info()
-
-            await asyncio.to_thread(
-                download_url, self.installed_release.archive_url, ext_zip_file
-            )
-
-            self._remember_payment_info()
-
+            download_url(self.installed_release.archive, ext_zip_file)
        except Exception as ex:
            logger.warning(ex)
-            raise AssertionError("Cannot fetch extension archive file")
+            raise HTTPException(
+                status_code=HTTPStatus.NOT_FOUND,
+                detail="Cannot fetch extension archive file",
+            )

        archive_hash = file_hash(ext_zip_file)
        if self.installed_release.hash and self.installed_release.hash != archive_hash:
            # remove downloaded archive
            if ext_zip_file.is_file():
                os.remove(ext_zip_file)
-            raise AssertionError("File hash missmatch. Will not install.")
+            raise HTTPException(
+                status_code=HTTPStatus.NOT_FOUND,
+                detail="File hash missmatch. Will not install.",
+            )

    def extract_archive(self):
        logger.info(f"Extracting extension {self.name} ({self.installed_version}).")
@@ -479,7 +438,7 @@ class InstallableExtension(BaseModel):
        shutil.copytree(Path(self.ext_upgrade_dir), Path(self.ext_dir))
        logger.success(f"Extension {self.name} ({self.installed_version}) installed.")

-    def notify_upgrade(self) -> None:
+    def nofiy_upgrade(self) -> None:
        """
        Update the list of upgraded extensions. The middleware will perform
        redirects based on this
@@ -511,57 +470,17 @@ class InstallableExtension(BaseModel):
        if not self.latest_release:
            self.latest_release = release
            return
-        if version_parse(self.latest_release.version) < version_parse(release.version):
+        if version.parse(self.latest_release.version) < version.parse(release.version):
            self.latest_release = release

-    def find_existing_payment(
-        self, pay_link: Optional[str]
-    ) -> Optional[ReleasePaymentInfo]:
-        if not pay_link:
-            return None
-        return next(
-            (p for p in self.payments if p.pay_link == pay_link),
-            None,
-        )
-
-    def _restore_payment_info(self):
-        if not self.installed_release:
-            return
-        if not self.installed_release.pay_link:
-            return
-        if self.installed_release.payment_hash:
-            return
-        payment_info = self.find_existing_payment(self.installed_release.pay_link)
-        if payment_info:
-            self.installed_release.payment_hash = payment_info.payment_hash
-
-    def _remember_payment_info(self):
-        if not self.installed_release or not self.installed_release.pay_link:
-            return
-        payment_info = ReleasePaymentInfo(
-            amount=self.installed_release.cost_sats,
-            pay_link=self.installed_release.pay_link,
-            payment_hash=self.installed_release.payment_hash,
-        )
-        self.payments = [
-            p for p in self.payments if p.pay_link != payment_info.pay_link
-        ]
-        self.payments.append(payment_info)
-
    @classmethod
    def from_row(cls, data: dict) -> "InstallableExtension":
        meta = json.loads(data["meta"])
        ext = InstallableExtension(**data)
        if "installed_release" in meta:
            ext.installed_release = ExtensionRelease(**meta["installed_release"])
-        if meta.get("payments"):
-            ext.payments = [ReleasePaymentInfo(**p) for p in meta["payments"]]
        return ext

-    @classmethod
-    def from_rows(cls, rows: List[Any] = []) -> List["InstallableExtension"]:
-        return [InstallableExtension.from_row(row) for row in rows]
-
    @classmethod
    async def from_github_release(
        cls, github_release: GitHubRelease
@@ -651,19 +570,17 @@ class InstallableExtension(BaseModel):
            try:
                manifest = await fetch_manifest(url)
                for r in manifest.repos:
-                    if r.id != ext_id:
-                        continue
-                    repo_releases = await ExtensionRelease.get_github_releases(
-                        r.organisation, r.repository
-                    )
-                    extension_releases += repo_releases
+                    if r.id == ext_id:
+                        repo_releases = await ExtensionRelease.all_releases(
+                            r.organisation, r.repository
+                        )
+                        extension_releases += repo_releases

                for e in manifest.extensions:
-                    if e.id != ext_id:
-                        continue
-                    explicit_release = ExtensionRelease.from_explicit_release(url, e)
-                    await explicit_release.check_payment_requirements()
-                    extension_releases.append(explicit_release)
+                    if e.id == ext_id:
+                        extension_releases += [
+                            ExtensionRelease.from_explicit_release(url, e)
+                        ]

            except Exception as e:
                logger.warning(f"Manifest {url} failed with '{str(e)}'")
@@ -672,17 +589,15 @@ class InstallableExtension(BaseModel):

    @classmethod
    async def get_extension_release(
-        cls, ext_id: str, source_repo: str, archive: str, version: str
+        cls, ext_id: str, source_repo: str, archive: str
    ) -> Optional["ExtensionRelease"]:
-        all_releases: List[ExtensionRelease] = (
-            await InstallableExtension.get_extension_releases(ext_id)
-        )
+        all_releases: List[
+            ExtensionRelease
+        ] = await InstallableExtension.get_extension_releases(ext_id)
        selected_release = [
            r
            for r in all_releases
-            if r.archive == archive
-            and r.source_repo == source_repo
-            and r.version == version
+            if r.archive == archive and r.source_repo == source_repo
        ]

        return selected_release[0] if len(selected_release) != 0 else None
@@ -692,35 +607,9 @@ class CreateExtension(BaseModel):
    ext_id: str
    archive: str
    source_repo: str
-    version: str
-    cost_sats: Optional[int] = 0
-    payment_hash: Optional[str] = None


-def get_valid_extensions(include_deactivated: Optional[bool] = True) -> List[Extension]:
-    valid_extensions = [
+def get_valid_extensions() -> List[Extension]:
+    return [
        extension for extension in ExtensionManager().extensions if extension.is_valid
    ]
-
-    if include_deactivated:
-        return valid_extensions
-
-    if settings.lnbits_extensions_deactivate_all:
-        return []
-
-    return [
-        e
-        for e in valid_extensions
-        if e.code not in settings.lnbits_deactivated_extensions
-    ]
-
-
-def version_parse(v: str):
-    """
-    Wrapper for version.parse() that does not throw if the version is invalid.
-    Instead it return the lowest possible version ("0.0.0")
-    """
-    try:
-        return version.parse(v)
-    except Exception:
-        return version.parse("0.0.0")
@@ -1,20 +1,15 @@
 import json
-import re
-from datetime import datetime, timedelta
 from pathlib import Path
 from typing import Any, List, Optional, Type

 import jinja2
 import shortuuid
-from jose import jwt
-from pydantic import BaseModel
 from pydantic.schema import field_schema

 from lnbits.jinja2_templating import Jinja2Templates
 from lnbits.nodes import get_node_class
 from lnbits.requestvars import g
 from lnbits.settings import settings
-from lnbits.utils.crypto import AESCipher

 from .db import FilterModel
 from .extension_manager import get_valid_extensions
@@ -33,10 +28,6 @@ def url_for(endpoint: str, external: Optional[bool] = False, **params: Any) -> s
    return url


-def static_url_for(static: str, path: str) -> str:
-    return f"/{static}/{path}?v={settings.server_startup_time}"
-
-
 def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templates:
    folders = ["lnbits/templates", "lnbits/core/templates"]
    if additional_folders:
@@ -46,7 +37,6 @@ def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templa
        ]
        folders.extend(additional_folders)
    t = Jinja2Templates(loader=jinja2.FileSystemLoader(folders))
-    t.env.globals["static_url_for"] = static_url_for

    if settings.lnbits_ad_space_enabled:
        t.env.globals["AD_SPACE"] = settings.lnbits_ad_space.split(",")
@@ -59,28 +49,23 @@ def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templa
    t.env.globals["SITE_TAGLINE"] = settings.lnbits_site_tagline
    t.env.globals["SITE_DESCRIPTION"] = settings.lnbits_site_description
    t.env.globals["LNBITS_THEME_OPTIONS"] = settings.lnbits_theme_options
-    t.env.globals["LNBITS_QR_LOGO"] = settings.lnbits_qr_logo
    t.env.globals["LNBITS_VERSION"] = settings.version
-    t.env.globals["LNBITS_NEW_ACCOUNTS_ALLOWED"] = settings.new_accounts_allowed
-    t.env.globals["LNBITS_AUTH_METHODS"] = settings.auth_allowed_methods
    t.env.globals["LNBITS_ADMIN_UI"] = settings.lnbits_admin_ui
-    t.env.globals["LNBITS_EXTENSIONS_DEACTIVATE_ALL"] = (
-        settings.lnbits_extensions_deactivate_all
-    )
-    t.env.globals["LNBITS_SERVICE_FEE"] = settings.lnbits_service_fee
-    t.env.globals["LNBITS_SERVICE_FEE_MAX"] = settings.lnbits_service_fee_max
-    t.env.globals["LNBITS_SERVICE_FEE_WALLET"] = settings.lnbits_service_fee_wallet
    t.env.globals["LNBITS_NODE_UI"] = (
        settings.lnbits_node_ui and get_node_class() is not None
    )
    t.env.globals["LNBITS_NODE_UI_AVAILABLE"] = get_node_class() is not None
-    t.env.globals["EXTENSIONS"] = get_valid_extensions(False)
+    t.env.globals["EXTENSIONS"] = [
+        e
+        for e in get_valid_extensions()
+        if e.code not in settings.lnbits_deactivated_extensions
+    ]
    if settings.lnbits_custom_logo:
        t.env.globals["USE_CUSTOM_LOGO"] = settings.lnbits_custom_logo

    if settings.bundle_assets:
-        t.env.globals["INCLUDED_JS"] = ["bundle.min.js"]
-        t.env.globals["INCLUDED_CSS"] = ["bundle.min.css"]
+        t.env.globals["INCLUDED_JS"] = ["/static/bundle.min.js"]
+        t.env.globals["INCLUDED_CSS"] = ["/static/bundle.min.css"]
    else:
        vendor_filepath = Path(settings.lnbits_path, "static", "vendor.json")
        with open(vendor_filepath) as vendor_file:
@@ -95,10 +80,6 @@ def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templa

 def get_current_extension_name() -> str:
    """
-    DEPRECATED: Use the repo name instead, will be removed in the future
-    before: `register_invoice_listener(invoice_queue, get_current_extension_name())`
-    after: `register_invoice_listener(invoice_queue, "my-extension")`
-
    Returns the name of the extension that calls this method.
    """
    import inspect
@@ -152,56 +133,3 @@ def generate_filter_params_openapi(model: Type[FilterModel], keep_optional=False
    return {
        "parameters": params,
    }
-
-
-def insert_query(table_name: str, model: BaseModel) -> str:
-    """
-    Generate an insert query with placeholders for a given table and model
-    :param table_name: Name of the table
-    :param model: Pydantic model
-    """
-    placeholders = ", ".join(["?"] * len(model.dict().keys()))
-    fields = ", ".join(model.dict().keys())
-    return f"INSERT INTO {table_name} ({fields}) VALUES ({placeholders})"
-
-
-def update_query(table_name: str, model: BaseModel, where: str = "WHERE id = ?") -> str:
-    """
-    Generate an update query with placeholders for a given table and model
-    :param table_name: Name of the table
-    :param model: Pydantic model
-    :param where: Where string, default to `WHERE id = ?`
-    """
-    query = ", ".join([f"{field} = ?" for field in model.dict().keys()])
-    return f"UPDATE {table_name} SET {query} {where}"
-
-
-def is_valid_email_address(email: str) -> bool:
-    email_regex = r"[A-Za-z0-9\._%+-]+@[A-Za-z0-9\.-]+\.[A-Za-z]{2,63}"
-    return re.fullmatch(email_regex, email) is not None
-
-
-def is_valid_username(username: str) -> bool:
-    username_regex = r"(?=[a-zA-Z0-9._]{2,20}$)(?!.*[_.]{2})[^_.].*[^_.]"
-    return re.fullmatch(username_regex, username) is not None
-
-
-def create_access_token(data: dict):
-    expire = datetime.utcnow() + timedelta(minutes=settings.auth_token_expire_minutes)
-    to_encode = data.copy()
-    to_encode.update({"exp": expire})
-    return jwt.encode(to_encode, settings.auth_secret_key, "HS256")
-
-
-def encrypt_internal_message(m: Optional[str] = None) -> Optional[str]:
-    """Encrypt message with the internal secret key"""
-    if not m:
-        return None
-    return AESCipher(key=settings.auth_secret_key).encrypt(m.encode())
-
-
-def decrypt_internal_message(m: Optional[str] = None) -> Optional[str]:
-    """Decrypt message with the internal secret key"""
-    if not m:
-        return None
-    return AESCipher(key=settings.auth_secret_key).decrypt(m)
@@ -8,8 +8,8 @@ from starlette.templating import Jinja2Templates as SuperJinja2Templates

 class Jinja2Templates(SuperJinja2Templates):
    def __init__(self, loader: BaseLoader) -> None:
+        super().__init__("")
        self.env = self.get_environment(loader)
-        super().__init__(env=self.env)

    def get_environment(self, loader: BaseLoader) -> Environment:
        @pass_context
@@ -1 +1,20 @@
-from lnurl import LnurlErrorResponse, decode, encode, handle  # noqa: F401
+from typing import Union
+
+from bech32 import bech32_decode, bech32_encode, convertbits
+from fastapi.datastructures import URL
+
+
+def decode(lnurl: str) -> str:
+    hrp, data = bech32_decode(lnurl)
+    assert hrp
+    assert data
+    bech32_data = convertbits(data, 5, 8, False)
+    assert bech32_data
+    return bytes(bech32_data).decode()
+
+
+def encode(url: Union[str, URL]) -> str:
+    bech32_data = convertbits(str(url).encode(), 8, 5, True)
+    assert bech32_data
+    lnurl = bech32_encode("lnurl", bech32_data)
+    return lnurl.upper()
@@ -1,8 +1,9 @@
 from http import HTTPStatus
 from typing import Any, List, Tuple, Union
+from urllib.parse import parse_qs

-from fastapi import FastAPI, Request
-from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
+from fastapi import FastAPI, Request, Response
+from fastapi.responses import HTMLResponse, JSONResponse
 from slowapi import _rate_limit_exceeded_handler
 from slowapi.errors import RateLimitExceeded
 from slowapi.middleware import SlowAPIMiddleware
@@ -24,44 +25,69 @@ class InstalledExtensionMiddleware:
        self.app = app

    async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
-        full_path = scope.get("path", "/")
-        if full_path == "/":
+        if "path" not in scope:
            await self.app(scope, receive, send)
            return

-        top_path, *rest = [p for p in full_path.split("/") if p]
+        path_elements = scope["path"].split("/")
+        if len(path_elements) > 2:
+            _, path_name, path_type, *rest = path_elements
+        else:
+            _, path_name = path_elements
+            path_type = None
+            rest = []
+
        headers = scope.get("headers", [])

        # block path for all users if the extension is disabled
-        if top_path in settings.lnbits_deactivated_extensions:
+        if path_name in settings.lnbits_deactivated_extensions:
            response = self._response_by_accepted_type(
-                scope, headers, f"Extension '{top_path}' disabled", HTTPStatus.NOT_FOUND
+                headers, f"Extension '{path_name}' disabled", HTTPStatus.NOT_FOUND
            )
            await response(scope, receive, send)
            return

-        # static resources do not require redirect
-        if rest[0:1] == ["static"]:
-            await self.app(scope, receive, send)
+        if not self._user_allowed_to_extension(path_name, scope):
+            response = self._response_by_accepted_type(
+                headers, "User not authorized.", HTTPStatus.FORBIDDEN
+            )
+            await response(scope, receive, send)
            return

-        upgrade_path = next(
-            (
-                e
-                for e in settings.lnbits_upgraded_extensions
-                if e.endswith(f"/{top_path}")
-            ),
-            None,
-        )
-        # re-route all trafic if the extension has been upgraded
-        if upgrade_path:
-            tail = "/".join(rest)
-            scope["path"] = f"/upgrades/{upgrade_path}/{tail}"
+        # re-route API trafic if the extension has been upgraded
+        if path_type == "api":
+            upgraded_extensions = list(
+                filter(
+                    lambda ext: ext.endswith(f"/{path_name}"),
+                    settings.lnbits_upgraded_extensions,
+                )
+            )
+            if len(upgraded_extensions) != 0:
+                upgrade_path = upgraded_extensions[0]
+                tail = "/".join(rest)
+                scope["path"] = f"/upgrades/{upgrade_path}/{path_type}/{tail}"

        await self.app(scope, receive, send)

+    def _user_allowed_to_extension(self, ext_name: str, scope) -> bool:
+        if ext_name not in settings.lnbits_admin_extensions:
+            return True
+        if "query_string" not in scope:
+            return True
+
+        # parse the URL query string into a `dict`
+        q = parse_qs(scope["query_string"].decode("UTF-8"))
+        user = q.get("usr", [""])[0]
+        if not user:
+            return True
+
+        if user == settings.super_user or user in settings.lnbits_admin_users:
+            return True
+
+        return False
+
    def _response_by_accepted_type(
-        self, scope: Scope, headers: List[Any], msg: str, status_code: HTTPStatus
+        self, headers: List[Any], msg: str, status_code: HTTPStatus
    ) -> Union[HTMLResponse, JSONResponse]:
        """
        Build an HTTP response containing the `msg` as HTTP body and the `status_code`
@@ -78,11 +104,11 @@ class InstalledExtensionMiddleware:
            "",
        )

-        if "text/html" in accept_header.split(","):
+        if "text/html" in [a for a in accept_header.split(",")]:
            return HTMLResponse(
                status_code=status_code,
                content=template_renderer()
-                .TemplateResponse(Request(scope), "error.html", {"err": msg})
+                .TemplateResponse("error.html", {"request": {}, "err": msg})
                .body,
            )

@@ -187,12 +213,7 @@ class ExtensionsRedirectMiddleware:

 def add_ratelimit_middleware(app: FastAPI):
    core_app_extra.register_new_ratelimiter()
-    # latest https://slowapi.readthedocs.io/en/latest/
-    # shows this as a valid way to add the handler
-    app.add_exception_handler(
-        RateLimitExceeded,
-        _rate_limit_exceeded_handler,  # type: ignore
-    )
+    app.add_exception_handler(RateLimitExceeded, _rate_limit_exceeded_handler)
    app.add_middleware(SlowAPIMiddleware)


@@ -212,21 +233,15 @@ def add_ip_block_middleware(app: FastAPI):
                status_code=403,  # Forbidden
                content={"detail": "IP is blocked"},
            )
-        return await call_next(request)
+        # this try: except: block is not needed on latest FastAPI
+        # (await call_next(request) is enough)
+        # https://stackoverflow.com/questions/71222144/runtimeerror-no-response-returned-in-fastapi-when-refresh-request
+        # TODO: remove after https://github.com/lnbits/lnbits/pull/1609 is merged
+        try:
+            return await call_next(request)
+        except RuntimeError as exc:
+            if str(exc) == "No response returned." and await request.is_disconnected():
+                return Response(status_code=HTTPStatus.NO_CONTENT)
+            raise  # bubble up different exceptions

    app.middleware("http")(block_allow_ip_middleware)
-
-
-def add_first_install_middleware(app: FastAPI):
-    @app.middleware("http")
-    async def first_install_middleware(request: Request, call_next):
-        if (
-            settings.first_install
-            and request.url.path != "/api/v1/auth/first_install"
-            and request.url.path != "/first_install"
-            and not request.url.path.startswith("/static")
-        ):
-            return RedirectResponse("/first_install")
-        return await call_next(request)
-
-    app.middleware("http")(first_install_middleware)
@@ -62,28 +62,15 @@ class ChannelStats(BaseModel):
        for channel in channels:
            counts[channel.state] = counts.get(channel.state, 0) + 1

-        active_channel_sizes = [
-            channel.balance.total_msat
-            for channel in channels
-            if channel.state == ChannelState.ACTIVE
-        ]
-
-        if len(active_channel_sizes) > 0:
-            return cls(
-                counts=counts,
-                avg_size=int(sum(active_channel_sizes) / len(active_channel_sizes)),
-                biggest_size=max(active_channel_sizes),
-                smallest_size=min(active_channel_sizes),
-                total_capacity=sum(active_channel_sizes),
-            )
-        else:
-            return cls(
-                counts=counts,
-                avg_size=0,
-                biggest_size=0,
-                smallest_size=0,
-                total_capacity=0,
-            )
+        return cls(
+            counts=counts,
+            avg_size=int(
+                sum(channel.balance.total_msat for channel in channels) / len(channels)
+            ),
+            biggest_size=max(channel.balance.total_msat for channel in channels),
+            smallest_size=min(channel.balance.total_msat for channel in channels),
+            total_capacity=sum(channel.balance.total_msat for channel in channels),
+        )


 class NodeFees(BaseModel):
@@ -117,7 +104,7 @@ class NodePayment(BaseModel):
    fee: Optional[int] = None
    memo: Optional[str] = None
    time: int
-    bolt11: Optional[str] = None
+    bolt11: str
    preimage: Optional[str]
    payment_hash: str
    expiry: Optional[float] = None
@@ -217,21 +217,17 @@ class CoreLightningNode(Node):
                state=(
                    ChannelState.ACTIVE
                    if ch["state"] == "CHANNELD_NORMAL"
-                    else (
-                        ChannelState.PENDING
-                        if ch["state"] in ("CHANNELD_AWAITING_LOCKIN", "OPENINGD")
-                        else (
-                            ChannelState.CLOSED
-                            if ch["state"]
-                            in (
-                                "CHANNELD_CLOSING",
-                                "CLOSINGD_COMPLETE",
-                                "CLOSINGD_SIGEXCHANGE",
-                                "ONCHAIN",
-                            )
-                            else ChannelState.INACTIVE
-                        )
+                    else ChannelState.PENDING
+                    if ch["state"] in ("CHANNELD_AWAITING_LOCKIN", "OPENINGD")
+                    else ChannelState.CLOSED
+                    if ch["state"]
+                    in (
+                        "CHANNELD_CLOSING",
+                        "CLOSINGD_COMPLETE",
+                        "CLOSINGD_SIGEXCHANGE",
+                        "ONCHAIN",
                    )
+                    else ChannelState.INACTIVE
                ),
            )
            for ch in funds["channels"]
@@ -251,9 +247,7 @@ class CoreLightningNode(Node):
            backend_name="CLN",
            alias=info["alias"],
            color=info["color"],
-            onchain_balance_sat=sum(
-                output["amount_msat"] / 1000 for output in funds["outputs"]
-            ),
+            onchain_balance_sat=sum(output["value"] for output in funds["outputs"]),
            onchain_confirmed_sat=sum(
                output["amount_msat"] / 1000
                for output in funds["outputs"]
@@ -275,7 +269,7 @@ class CoreLightningNode(Node):
            result = await self.ln_rpc("listpays")
            return [
                NodePayment(
-                    bolt11=pay.get("bolt11"),
+                    bolt11=pay["bolt11"],
                    amount=pay["amount_msat"],
                    fee=int(pay["amount_msat"]) - int(pay["amount_sent_msat"]),
                    memo=pay.get("description"),
@@ -314,17 +308,10 @@ class CoreLightningNode(Node):
        return Page(
            data=[
                NodeInvoice(
-                    bolt11=invoice.get("bolt11") or invoice.get("bolt12"),
-                    amount=(
-                        # normal invoice
-                        invoice.get("amount_msat")
-                        # keysend or paid amountless invoice
-                        or invoice.get("amount_received_msat")
-                        # unpaid amountless invoice
-                        or 0
-                    ),
+                    bolt11=invoice["bolt11"],
+                    amount=invoice["amount_msat"],
                    preimage=invoice.get("payment_preimage"),
-                    memo=invoice.get("description"),
+                    memo=invoice["description"],
                    paid_at=invoice.get("paid_at"),
                    expiry=invoice["expires_at"],
                    payment_hash=invoice["payment_hash"],
@@ -167,8 +167,6 @@ class LndRestNode(Node):
        point: Optional[ChannelPoint] = None,
        force: bool = False,
    ):
-        if short_id:
-            logger.debug(f"Closing channel with short_id: {short_id}")
        if not point:
            raise HTTPException(
                status_code=HTTPStatus.BAD_REQUEST, detail="Channel point required"
@@ -239,11 +237,9 @@ class LndRestNode(Node):
                        remote_msat=msat(channel["remote_balance"]),
                        total_msat=msat(channel["capacity"]),
                    ),
-                    state=(
-                        ChannelState.ACTIVE
-                        if channel["active"]
-                        else ChannelState.INACTIVE
-                    ),
+                    state=ChannelState.ACTIVE
+                    if channel["active"]
+                    else ChannelState.INACTIVE,
                    # name=channel['peer_alias'],
                    name=info.alias,
                    color=info.color,
@@ -322,13 +318,11 @@ class LndRestNode(Node):
                amount=payment["value_msat"],
                fee=payment["fee_msat"],
                time=payment["creation_date"],
-                destination=(
-                    await self.get_peer_info(
-                        payment["htlcs"][0]["route"]["hops"][-1]["pub_key"]
-                    )
-                    if payment["htlcs"]
-                    else None
-                ),
+                destination=await self.get_peer_info(
+                    payment["htlcs"][0]["route"]["hops"][-1]["pub_key"]
+                )
+                if payment["htlcs"]
+                else None,
                bolt11=payment["payment_request"],
                preimage=payment["payment_preimage"],
            )
@@ -375,7 +369,7 @@ class LndRestNode(Node):
                memo=invoice["memo"],
                pending=invoice["state"] == "OPEN",
                paid_at=invoice["settle_date"],
-                expiry=int(invoice["creation_date"]) + int(invoice["expiry"]),
+                expiry=invoice["creation_date"] + invoice["expiry"],
                preimage=_decode_bytes(invoice["r_preimage"]),
                bolt11=invoice["payment_request"],
            )
@@ -10,10 +10,10 @@ from lnbits.settings import set_cli_settings, settings


@click.command(
-    context_settings={
-        "ignore_unknown_options": True,
-        "allow_extra_args": True,
-    }
+    context_settings=dict(
+        ignore_unknown_options=True,
+        allow_extra_args=True,
+    )
 )
@click.option("--port", default=settings.port, help="Port to listen on")
@click.option("--host", default=settings.host, help="Host to run LNBits on")
@@ -37,7 +37,6 @@ def main(

    # create data dir if it does not exist
    Path(settings.lnbits_data_folder).mkdir(parents=True, exist_ok=True)
-    Path(settings.lnbits_data_folder, "logs").mkdir(parents=True, exist_ok=True)

    # create `extensions`` dir if it does not exist
    Path(settings.lnbits_extensions_path, "extensions").mkdir(
@@ -48,7 +47,7 @@ def main(

    # this beautiful beast parses all command line arguments and
    # passes them to the uvicorn server
-    d = {}
+    d = dict()
    for a in ctx.args:
        item = a.split("=")
        if len(item) > 1:  # argument like --key=value
@@ -4,11 +4,8 @@ import importlib
 import importlib.metadata
 import inspect
 import json
-from enum import Enum
-from hashlib import sha256
 from os import path
 from sqlite3 import Row
-from time import time
 from typing import Any, List, Optional

 import httpx
@@ -38,16 +35,10 @@ class LNbitsSettings(BaseModel):
 class UsersSettings(LNbitsSettings):
    lnbits_admin_users: List[str] = Field(default=[])
    lnbits_allowed_users: List[str] = Field(default=[])
-    lnbits_allow_new_accounts: bool = Field(default=True)
-
-    @property
-    def new_accounts_allowed(self) -> bool:
-        return self.lnbits_allow_new_accounts and len(self.lnbits_allowed_users) == 0


 class ExtensionsSettings(LNbitsSettings):
    lnbits_admin_extensions: List[str] = Field(default=[])
-    lnbits_extensions_deactivate_all: bool = Field(default=False)
    lnbits_extensions_manifests: List[str] = Field(
        default=[
            "https://raw.githubusercontent.com/lnbits/lnbits-extensions/main/extensions.json"
@@ -69,16 +60,6 @@ class InstalledExtensionsSettings(LNbitsSettings):
    # list of redirects that extensions want to perform
    lnbits_extensions_redirects: List[Any] = Field(default=[])

-    def extension_upgrade_path(self, ext_id: str) -> Optional[str]:
-        return next(
-            (e for e in self.lnbits_upgraded_extensions if e.endswith(f"/{ext_id}")),
-            None,
-        )
-
-    def extension_upgrade_hash(self, ext_id: str) -> Optional[str]:
-        path = settings.extension_upgrade_path(ext_id)
-        return path.split("/")[0] if path else None
-

 class ThemesSettings(LNbitsSettings):
    lnbits_site_title: str = Field(default="LNbits")
@@ -104,7 +85,6 @@ class ThemesSettings(LNbitsSettings):
    lnbits_ad_space_enabled: bool = Field(default=False)
    lnbits_allowed_currencies: List[str] = Field(default=[])
    lnbits_default_accounting_currency: Optional[str] = Field(default=None)
-    lnbits_qr_logo: str = Field(default="/static/images/logos/lnbits.png")


 class OpsSettings(LNbitsSettings):
@@ -112,9 +92,6 @@ class OpsSettings(LNbitsSettings):
    lnbits_reserve_fee_min: int = Field(default=2000)
    lnbits_reserve_fee_percent: float = Field(default=1.0)
    lnbits_service_fee: float = Field(default=0)
-    lnbits_service_fee_ignore_internal: bool = Field(default=True)
-    lnbits_service_fee_max: int = Field(default=0)
-    lnbits_service_fee_wallet: str = Field(default=None)
    lnbits_hide_api: bool = Field(default=False)
    lnbits_denomination: str = Field(default="sats")

@@ -127,9 +104,6 @@ class SecuritySettings(LNbitsSettings):
    lnbits_notifications: bool = Field(default=False)
    lnbits_killswitch: bool = Field(default=False)
    lnbits_killswitch_interval: int = Field(default=60)
-    lnbits_wallet_limit_max_balance: int = Field(default=0)
-    lnbits_wallet_limit_daily_max_withdraw: int = Field(default=0)
-    lnbits_wallet_limit_secs_between_trans: int = Field(default=0)
    lnbits_watchdog: bool = Field(default=False)
    lnbits_watchdog_interval: int = Field(default=60)
    lnbits_watchdog_delta: int = Field(default=1_000_000)
@@ -139,13 +113,6 @@ class SecuritySettings(LNbitsSettings):
        )
    )

-    def is_wallet_max_balance_exceeded(self, amount):
-        return (
-            self.lnbits_wallet_limit_max_balance
-            and self.lnbits_wallet_limit_max_balance > 0
-            and amount > self.lnbits_wallet_limit_max_balance
-        )
-

 class FakeWalletFundingSource(LNbitsSettings):
    fake_wallet_secret: str = Field(default="ToTheMoon1")
@@ -183,7 +150,6 @@ class LndRestFundingSource(LNbitsSettings):
    lnd_rest_cert: Optional[str] = Field(default=None)
    lnd_rest_macaroon: Optional[str] = Field(default=None)
    lnd_rest_macaroon_encrypted: Optional[str] = Field(default=None)
-    lnd_rest_route_hints: bool = Field(default=True)
    lnd_cert: Optional[str] = Field(default=None)
    lnd_admin_macaroon: Optional[str] = Field(default=None)
    lnd_invoice_macaroon: Optional[str] = Field(default=None)
@@ -208,16 +174,6 @@ class LnPayFundingSource(LNbitsSettings):
    lnpay_admin_key: Optional[str] = Field(default=None)


-class ZBDFundingSource(LNbitsSettings):
-    zbd_api_endpoint: Optional[str] = Field(default="https://api.zebedee.io/v0/")
-    zbd_api_key: Optional[str] = Field(default=None)
-
-
-class AlbyFundingSource(LNbitsSettings):
-    alby_api_endpoint: Optional[str] = Field(default="https://api.getalby.com/")
-    alby_access_token: Optional[str] = Field(default=None)
-
-
 class OpenNodeFundingSource(LNbitsSettings):
    opennode_api_endpoint: Optional[str] = Field(default=None)
    opennode_key: Optional[str] = Field(default=None)
@@ -237,6 +193,14 @@ class LnTipsFundingSource(LNbitsSettings):
    lntips_invoice_key: Optional[str] = Field(default=None)


+# todo: must be extracted
+class BoltzExtensionSettings(LNbitsSettings):
+    boltz_network: str = Field(default="main")
+    boltz_url: str = Field(default="https://boltz.exchange/api")
+    boltz_mempool_space_url: str = Field(default="https://mempool.space")
+    boltz_mempool_space_url_ws: str = Field(default="wss://mempool.space")
+
+
 class LightningSettings(LNbitsSettings):
    lightning_invoice_expiry: int = Field(default=3600)

@@ -251,8 +215,6 @@ class FundingSourcesSettings(
    LndRestFundingSource,
    LndGrpcFundingSource,
    LnPayFundingSource,
-    AlbyFundingSource,
-    ZBDFundingSource,
    OpenNodeFundingSource,
    SparkFundingSource,
    LnTipsFundingSource,
@@ -275,44 +237,6 @@ class NodeUISettings(LNbitsSettings):
    lnbits_node_ui_transactions: bool = Field(default=False)


-class AuthMethods(Enum):
-    user_id_only = "user-id-only"
-    username_and_password = "username-password"
-    google_auth = "google-auth"
-    github_auth = "github-auth"
-    keycloak_auth = "keycloak-auth"
-
-
-class AuthSettings(LNbitsSettings):
-    auth_token_expire_minutes: int = Field(default=525600)
-    auth_all_methods = [a.value for a in AuthMethods]
-    auth_allowed_methods: List[str] = Field(
-        default=[
-            AuthMethods.user_id_only.value,
-            AuthMethods.username_and_password.value,
-        ]
-    )
-
-    def is_auth_method_allowed(self, method: AuthMethods):
-        return method.value in self.auth_allowed_methods
-
-
-class GoogleAuthSettings(LNbitsSettings):
-    google_client_id: str = Field(default="")
-    google_client_secret: str = Field(default="")
-
-
-class GitHubAuthSettings(LNbitsSettings):
-    github_client_id: str = Field(default="")
-    github_client_secret: str = Field(default="")
-
-
-class KeycloakAuthSettings(LNbitsSettings):
-    keycloak_discovery_url: str = Field(default="")
-    keycloak_client_id: str = Field(default="")
-    keycloak_client_secret: str = Field(default="")
-
-
 class EditableSettings(
    UsersSettings,
    ExtensionsSettings,
@@ -320,13 +244,10 @@ class EditableSettings(
    OpsSettings,
    SecuritySettings,
    FundingSourcesSettings,
+    BoltzExtensionSettings,
    LightningSettings,
    WebPushSettings,
    NodeUISettings,
-    AuthSettings,
-    GoogleAuthSettings,
-    GitHubAuthSettings,
-    KeycloakAuthSettings,
 ):
    @validator(
        "lnbits_admin_users",
@@ -360,7 +281,6 @@ class UpdateSettings(EditableSettings):

 class EnvSettings(LNbitsSettings):
    debug: bool = Field(default=False)
-    debug_database: bool = Field(default=False)
    bundle_assets: bool = Field(default=True)
    host: str = Field(default="127.0.0.1")
    port: int = Field(default=5000)
@@ -369,14 +289,7 @@ class EnvSettings(LNbitsSettings):
    lnbits_path: str = Field(default=".")
    lnbits_extensions_path: str = Field(default="lnbits")
    super_user: str = Field(default="")
-    auth_secret_key: str = Field(default="")
    version: str = Field(default="0.0.0")
-    user_agent: str = Field(default="")
-    enable_log_to_file: bool = Field(default=True)
-    log_rotation: str = Field(default="100 MB")
-    log_retention: str = Field(default="3 months")
-    server_startup_time: int = Field(default=time())
-    cleanup_wallets_days: int = Field(default=90)

    @property
    def has_default_extension_path(self) -> bool:
@@ -406,8 +319,6 @@ class SuperUserSettings(LNbitsSettings):
            "LndWallet",
            "LnTipsWallet",
            "LNPayWallet",
-            "AlbyWallet",
-            "ZBDWallet",
            "LNbitsWallet",
            "OpenNodeWallet",
        ]
@@ -420,7 +331,6 @@ class TransientSettings(InstalledExtensionsSettings):
    #  - are not read from a file or from the `settings` table
    #  - are not persisted in the `settings` table when the settings are updated
    #  - are cleared on server restart
-    first_install: bool = Field(default=False)

    @classmethod
    def readonly_fields(cls):
@@ -461,14 +371,6 @@ class Settings(EditableSettings, ReadOnlySettings, TransientSettings, BaseSettin
        case_sensitive = False
        json_loads = list_parse_fallback

-    def is_user_allowed(self, user_id: str):
-        return (
-            len(self.lnbits_allowed_users) == 0
-            or user_id in self.lnbits_allowed_users
-            or user_id in self.lnbits_admin_users
-            or user_id == self.super_user
-        )
-

 class SuperSettings(EditableSettings):
    super_user: str
@@ -517,12 +419,6 @@ settings = Settings()
 settings.lnbits_path = str(path.dirname(path.realpath(__file__)))

 settings.version = importlib.metadata.version("lnbits")
-settings.auth_secret_key = (
-    settings.auth_secret_key or sha256(settings.super_user.encode("utf-8")).hexdigest()
-)
-
-if not settings.user_agent:
-    settings.user_agent = f"LNbits/{settings.version}"

 # printing environment variable for debugging
 if not settings.lnbits_admin_ui:
@@ -502,6 +502,12 @@ video {
  border-radius: 3px;
 }

+@font-face {
+  font-family: "Material Icons";
+  font-style: normal;
+  font-weight: 400;
+  src: url(/static/fonts/material-icons-v50.woff2) format("woff2");
+}
 .material-icons {
  font-family: "Material Icons";
  font-weight: normal;
@@ -529,28 +535,3 @@ video {
 .q-card code {
  overflow-wrap: break-word;
 }
-
-.qrcode__wrapper canvas {
-  position: relative;
-  width: 100% !important;
-  max-width: 100%;
-  max-height: 100%;
-}
-
-.qrcode__image {
-  width: 15%;
-  height: 15%;
-  overflow: hidden;
-  background: #fff;
-  left: 50%;
-  overflow: hidden;
-  position: absolute;
-  top: 50%;
-  transform: translate(-50%, -50%);
-  padding: 0.2rem;
-  border-radius: 0.2rem;
-}
-
-.whitespace-pre-line {
-  white-space: pre-line;
-}
@@ -1,26 +1,8 @@
 window.localisation.br = {
-  confirm: 'Sim',
  server: 'Servidor',
  theme: 'Tema',
  funding: 'Financiamento',
  users: 'Usuários',
-  apps: 'Aplicativos',
-  channels: 'Canais',
-  transactions: 'Transações',
-  dashboard: 'Painel de Controle',
-  node: 'Nó',
-  total_capacity: 'Capacidade Total',
-  avg_channel_size: 'Tamanho médio do canal',
-  biggest_channel_size: 'Maior Tamanho de Canal',
-  smallest_channel_size: 'Tamanho Mínimo do Canal',
-  number_of_channels: 'Número de Canais',
-  active_channels: 'Canais Ativos',
-  connect_peer: 'Conectar Par',
-  connect: 'Conectar',
-  open_channel: 'Canal Aberto',
-  open: 'Abrir',
-  close_channel: 'Fechar Canal',
-  close: 'Fechar',
  restart: 'Reiniciar servidor',
  save: 'Salvar',
  save_tooltip: 'Salvar suas alterações',
@@ -36,7 +18,7 @@ window.localisation.br = {
  name_your_wallet: 'Nomeie sua carteira %{name}',
  paste_invoice_label: 'Cole uma fatura, pedido de pagamento ou código lnurl *',
  lnbits_description:
-    'Fácil de configurar e leve, o LNbits pode ser executado em qualquer fonte de financiamento da Lightning Network e até mesmo o LNbits em si! Você pode executar o LNbits para si mesmo ou oferecer facilmente uma solução de custódia para outros. Cada carteira tem suas próprias chaves de API e não há limite para o número de carteiras que você pode criar. Ser capaz de particionar fundos torna o LNbits uma ferramenta útil para gerenciamento de dinheiro e como uma ferramenta de desenvolvimento. As extensões adicionam funcionalidades extras ao LNbits para que você possa experimentar uma série de tecnologias de ponta na rede lightning. Nós tornamos o desenvolvimento de extensões o mais fácil possível e, como um projeto gratuito e de código aberto, incentivamos as pessoas a desenvolver e enviar as suas próprias.',
+    'Fácil de configurar e leve, o LNbits pode ser executado em qualquer fonte de financiamento da lightning-network, atualmente suportando LND, c-lightning, OpenNode, LNPay e até mesmo o LNbits em si! Você pode executar o LNbits para si mesmo ou oferecer facilmente uma solução de custódia para outros. Cada carteira tem suas próprias chaves de API e não há limite para o número de carteiras que você pode criar. Ser capaz de particionar fundos torna o LNbits uma ferramenta útil para gerenciamento de dinheiro e como uma ferramenta de desenvolvimento. As extensões adicionam funcionalidades extras ao LNbits para que você possa experimentar uma série de tecnologias de ponta na rede lightning. Nós tornamos o desenvolvimento de extensões o mais fácil possível e, como um projeto gratuito e de código aberto, incentivamos as pessoas a desenvolver e enviar as suas próprias.',
  export_to_phone: 'Exportar para o telefone com código QR',
  export_to_phone_desc:
    'Este código QR contém a URL da sua carteira com acesso total. Você pode escaneá-lo do seu telefone para abrir sua carteira a partir dele.',
@@ -47,38 +29,27 @@ window.localisation.br = {
    'Toda a carteira será excluída, os fundos serão IRRECUPERÁVEIS.',
  rename_wallet: 'Renomear carteira',
  update_name: 'Atualizar nome',
-  fiat_tracking: 'Rastreamento Fiat',
-  currency: 'Moeda',
-  update_currency: 'Atualizar moeda',
  press_to_claim: 'Pressione para solicitar bitcoin',
  donate: 'Doar',
  view_github: 'Ver no GitHub',
  voidwallet_active: 'VoidWallet está ativo! Pagamentos desabilitados',
  use_with_caution: 'USE COM CAUTELA - a carteira %{name} ainda está em BETA',
-  service_fee: 'Taxa de serviço: %{amount} % por transação',
-  service_fee_max:
-    'Taxa de serviço: %{amount} % por transação (máx %{max} sats)',
-  service_fee_tooltip:
-    'Taxa de serviço cobrada pelo administrador do servidor LNbits por transação de saída',
  toggle_darkmode: 'Alternar modo escuro',
-  payment_reactions: 'Reações de Pagamento',
  view_swagger_docs: 'Ver a documentação da API do LNbits Swagger',
  api_docs: 'Documentação da API',
-  api_keys_api_docs: 'URL do Node, chaves da API e documentação da API',
  lnbits_version: 'Versão do LNbits',
  runs_on: 'Executa em',
  credit_hint: 'Pressione Enter para creditar a conta',
  credit_label: '%{denomination} para creditar',
-  paste: 'Colar',
-  paste_from_clipboard: 'Cole do clipboard',
  paste_request: 'Colar Pedido',
  create_invoice: 'Criar Fatura',
  camera_tooltip: 'Usar a câmara para escanear uma fatura / QR',
  export_csv: 'Exportar para CSV',
+  transactions: 'Transações',
  chart_tooltip: 'Mostrar gráfico',
  pending: 'Pendente',
  copy_invoice: 'Copiar fatura',
-  withdraw_from: 'Sacar de',
+  close: 'Fechar',
  cancel: 'Cancelar',
  scan: 'Escanear',
  read: 'Ler',
@@ -102,144 +73,17 @@ window.localisation.br = {
  disclaimer_dialog:
    'Funcionalidade de login a ser lançada em uma atualização futura, por enquanto, certifique-se de marcar esta página para acesso futuro à sua carteira! Este serviço está em BETA, e não nos responsabilizamos por pessoas que perderem o acesso aos fundos.',
  no_transactions: 'Ainda não foram feitas transações',
-  manage: 'Gerenciar',
+  manage_extensions: 'Gerenciar extensões',
+  manage_server: 'Gerenciar servidor',
  extensions: 'Extensões',
  no_extensions: 'Você não possui nenhuma extensão instalada :(',
  created: 'Criado',
-  search_extensions: 'Extensões de pesquisa',
-  warning: 'Aviso',
-  repository: 'Repositório',
-  confirm_continue: 'Você tem certeza de que deseja continuar?',
-  manage_extension_details: 'Instalar/desinstalar extensão',
-  install: 'Instalar',
-  uninstall: 'Desinstalar',
-  drop_db: 'Remover Dados',
-  enable: 'Ativar',
-  enable_extension_details: 'Ativar extensão para o usuário atual',
-  disable: 'Desativar',
-  installed: 'Instalado',
-  activated: 'Ativado',
-  deactivated: 'Desativado',
-  release_notes: 'Notas de Lançamento',
-  activate_extension_details:
-    'Tornar a extensão disponível/indisponível para usuários',
-  featured: 'Destacado',
-  all: 'Tudo',
-  only_admins_can_install:
-    'Apenas contas de administrador podem instalar extensões.',
-  admin_only: 'Apenas para Administração',
-  new_version: 'Nova Versão',
-  extension_depends_on: 'Depende de:',
-  extension_rating_soon: 'Avaliações estarão disponíveis em breve',
-  extension_installed_version: 'Versão instalada',
-  extension_uninstall_warning:
-    'Você está prestes a remover a extensão para todos os usuários.',
-  uninstall_confirm: 'Sim, Desinstalar',
-  extension_db_drop_info:
-    'Todos os dados da extensão serão permanentemente excluídos. Não há como desfazer essa operação!',
-  extension_db_drop_warning:
-    'Você está prestes a remover todos os dados para a extensão. Por favor, digite o nome da extensão para continuar:',
-  extension_min_lnbits_version:
-    'Esta versão requer no mínimo a versão do LNbits',
  payment_hash: 'Hash de pagamento',
  fee: 'Taxa',
  amount: 'Quantidade',
-  tag: 'Etiqueta',
  unit: 'Unidade',
  description: 'Descrição',
  expiry: 'Validade',
  webhook: 'Webhook',
-  payment_proof: 'Comprovante de pagamento',
-  update_available: 'Atualização %{version} disponível!',
-  latest_update: 'Você está na versão mais recente %{version}.',
-  notifications: 'Notificações',
-  no_notifications: 'Sem notificações',
-  notifications_disabled:
-    'As notificações de status do LNbits estão desativadas.',
-  enable_notifications: 'Ativar notificações',
-  enable_notifications_desc:
-    'Se ativado, ele buscará as últimas atualizações de status do LNbits, como incidentes de segurança e atualizações.',
-  enable_killswitch: 'Ativar Killswitch',
-  enable_killswitch_desc:
-    'Se ativado, mudará sua fonte de fundos para VoidWallet automaticamente se o LNbits enviar um sinal de desativação. Você precisará ativar manualmente após uma atualização.',
-  killswitch_interval: 'Intervalo do Killswitch',
-  killswitch_interval_desc:
-    'Com que frequência a tarefa de fundo deve verificar o sinal de desativação do LNBits proveniente da fonte de status (em minutos).',
-  enable_watchdog: 'Ativar Watchdog',
-  enable_watchdog_desc:
-    'Se ativado, ele mudará automaticamente sua fonte de financiamento para VoidWallet se o seu saldo for inferior ao saldo do LNbits. Você precisará ativar manualmente após uma atualização.',
-  watchdog_interval: 'Intervalo do Watchdog',
-  watchdog_interval_desc:
-    'Com que frequência a tarefa de fundo deve verificar um sinal de interrupção no delta do monitor [node_balance - lnbits_balance] (em minutos).',
-  watchdog_delta: 'Observador Delta',
-  watchdog_delta_desc:
-    'Limite antes da mudança do mecanismo de segurança alterar a fonte de financiamento para VoidWallet [lnbits_balance - node_balance > delta]',
-  status: 'Estado',
-  notification_source: 'Fonte de Notificação',
-  notification_source_label:
-    'URL de origem (use apenas a fonte de status oficial do LNbits e fontes de confiança)',
-  more: 'mais',
-  less: 'menos',
-  releases: 'Lançamentos',
-  killswitch: 'Dispositivo de desativação',
-  watchdog: 'Cão de guarda',
-  server_logs: 'Registros do Servidor',
-  ip_blocker: 'Bloqueador de IP',
-  security: 'Segurança',
-  security_tools: 'Ferramentas de segurança',
-  block_access_hint: 'Bloquear acesso por IP',
-  allow_access_hint: 'Permitir acesso por IP (substituirá os IPs bloqueados)',
-  enter_ip: 'Digite o IP e pressione enter',
-  rate_limiter: 'Limitador de Taxa',
-  wallet_limiter: 'Limitador de Carteira',
-  wallet_limit_max_withdraw_per_day:
-    'Retirada máxima diária da carteira em sats (0 para desativar)',
-  wallet_max_ballance: 'Saldo máximo da carteira em sats (0 para desativar)',
-  wallet_limit_secs_between_trans:
-    'Minutos e segundos entre transações por carteira (0 para desativar)',
-  number_of_requests: 'Número de solicitações',
-  time_unit: 'Unidade de tempo',
-  minute: 'minuto',
-  second: 'segundo',
-  hour: 'hora',
-  disable_server_log: 'Desativar Log do Servidor',
-  enable_server_log: 'Ativar Registro do Servidor',
-  coming_soon: 'Funcionalidade em breve',
-  session_has_expired: 'Sua sessão expirou. Por favor, faça login novamente.',
-  instant_access_question: 'Quer acesso imediato?',
-  login_with_user_id: 'Faça login com ID do usuário',
-  or: 'ou',
-  create_new_wallet: 'Criar Nova Carteira',
-  login_to_account: 'Faça login na sua conta',
-  create_account: 'Criar conta',
-  account_settings: 'Configurações da Conta',
-  signin_with_google: 'Entrar com o Google',
-  signin_with_github: 'Entrar com GitHub',
-  signin_with_keycloak: 'Entrar com Keycloak',
-  username_or_email: 'Nome de usuário ou E-mail',
-  password: 'Senha',
-  password_config: 'Configuração de Senha',
-  password_repeat: 'Repetição de senha',
-  change_password: 'Alterar Senha',
-  set_password: 'Definir Senha',
-  invalid_password: 'A senha deve ter pelo menos 8 caracteres',
-  login: 'Entrar',
-  register: 'Registrar',
-  username: 'Nome de usuário',
-  user_id: 'ID do Usuário',
-  email: 'E-mail',
-  first_name: 'Primeiro Nome',
-  last_name: 'Sobrenome',
-  picture: 'Foto',
-  verify_email: 'Verifique o e-mail com',
-  account: 'Conta',
-  update_account: 'Atualizar Conta',
-  invalid_username: 'Nome de usuário inválido',
-  auth_provider: 'Provedor de Autenticação',
-  my_account: 'Minha Conta',
-  back: 'Voltar',
-  logout: 'Sair',
-  look_and_feel: 'Aparência',
-  language: 'Idioma',
-  color_scheme: 'Esquema de Cores'
+  payment_proof: 'Comprovante de pagamento'
 }
@@ -4,23 +4,6 @@ window.localisation.cn = {
  theme: '主题',
  funding: '资金',
  users: '用户',
-  apps: '应用程序',
-  channels: '频道',
-  transactions: '交易记录',
-  dashboard: '控制面板',
-  node: '节点',
-  total_capacity: '总容量',
-  avg_channel_size: '平均频道大小',
-  biggest_channel_size: '最大通道大小',
-  smallest_channel_size: '最小频道尺寸',
-  number_of_channels: '频道数量',
-  active_channels: '活跃频道',
-  connect_peer: '连接对等',
-  connect: '连接',
-  open_channel: '打开频道',
-  open: '打开',
-  close_channel: '关闭频道',
-  close: '关闭',
  restart: '重新启动服务器',
  save: '保存',
  save_tooltip: '保存更改',
@@ -35,7 +18,7 @@ window.localisation.cn = {
  name_your_wallet: '给你的 %{name}钱包起个名字',
  paste_invoice_label: '粘贴发票，付款请求或lnurl*',
  lnbits_description:
-    'LNbits 设置简单、轻量级，可以在任何闪电网络的资金来源上运行，甚至可以在LNbits自身上运行！您可以为自己运行LNbits，或者轻松为他人提供托管解决方案。每个钱包都有自己的 API 密钥，你可以创建的钱包数量没有限制。能够把资金分开管理使 LNbits 成为一款有用的资金管理和开发工具。扩展程序增加了 LNbits 的额外功能，所以你可以在闪电网络上尝试各种尖端技术。我们已经尽可能简化了开发扩展程序的过程，作为一个免费和开源的项目，我们鼓励人们开发并提交自己的扩展程序。',
+    'LNbits 设置简单、轻量级，可以运行在任何闪电网络的版本上，目前支持 LND、Core Lightning、OpenNode、LNPay，甚至 LNbits 本身！您可以为自己运行 LNbits，或者为他人轻松提供资金托管。每个钱包都有自己的 API 密钥，你可以创建的钱包数量没有限制。能够把资金分开管理使 LNbits 成为一款有用的资金管理和开发工具。扩展程序增加了 LNbits 的额外功能，所以你可以在闪电网络上尝试各种尖端技术。我们已经尽可能简化了开发扩展程序的过程，作为一个免费和开源的项目，我们鼓励人们开发并提交自己的扩展程序。',
  export_to_phone: '通过二维码导出到手机',
  export_to_phone_desc:
    '这个二维码包含您钱包的URL。您可以使用手机扫描的方式打开您的钱包。',
@@ -45,36 +28,27 @@ window.localisation.cn = {
  delete_wallet_desc: '整个钱包将被删除，资金将无法恢复',
  rename_wallet: '重命名钱包',
  update_name: '更新名称',
-  fiat_tracking: '菲亚特追踪',
-  currency: '货币',
-  update_currency: '更新货币',
  press_to_claim: '点击领取比特币',
  donate: '捐献',
  view_github: '在GitHub上查看',
  voidwallet_active: 'VoidWallet 已激活！付款功能已禁用。',
  use_with_caution: '请谨慎使用 - %{name}钱包还处于测试版阶段',
-  service_fee: '服务费：%{amount}% 每笔交易',
-  service_fee_max: '服务费：%{amount}% 每笔交易（最高 %{max} sats）',
-  service_fee_tooltip: 'LNbits服务器管理员每笔外发交易收取的服务费',
  toggle_darkmode: '切换暗黑模式',
-  payment_reactions: '支付反应',
  view_swagger_docs: '查看 LNbits Swagger API 文档',
  api_docs: 'API文档',
-  api_keys_api_docs: '节点URL、API密钥和API文档',
  lnbits_version: 'LNbits版本',
  runs_on: '可运行在',
  credit_hint: '按 Enter 键充值账户',
  credit_label: '%{denomination} 充值',
-  paste: '粘贴',
-  paste_from_clipboard: '从剪贴板粘贴',
  paste_request: '粘贴请求',
  create_invoice: '创建发票',
  camera_tooltip: '用相机扫描发票/二维码',
  export_csv: '导出为CSV',
+  transactions: '交易记录',
  chart_tooltip: '显示图表',
  pending: '待处理',
  copy_invoice: '复制发票',
-  withdraw_from: '从',
+  close: '关闭',
  cancel: '取消',
  scan: '扫描',
  read: '读取',
@@ -98,18 +72,21 @@ window.localisation.cn = {
  disclaimer_dialog:
    '登录功能将在以后的更新中发布，请将此页面加为书签，以便将来访问您的钱包！此服务处于测试阶段，我们不对资金的丢失承担任何责任。',
  no_transactions: '尚未进行任何交易',
-  manage: '管理',
+  manage_server: '管理服务器',
  extensions: '扩展程序',
  no_extensions: '你没有安装任何扩展程序 :(',
  created: '已创建',
+
  search_extensions: '搜索扩展程序',
  warning: '警告',
+  manage: '管理',
  repository: '代码库',
  confirm_continue: '你确定要继续吗?',
  manage_extension_details: '安装/卸载扩展程序',
  install: '安装',
  uninstall: '卸载',
  drop_db: '删除数据',
+  open: '打开',
  enable: '启用',
  enable_extension_details: '为当前用户启用扩展程序',
  disable: '禁用',
@@ -131,103 +108,15 @@ window.localisation.cn = {
  extension_db_drop_info: '该扩展程序的所有数据将被永久删除。此操作无法撤销！',
  extension_db_drop_warning:
    '您即将删除该扩展的所有数据。请继续输入扩展程序名称以确认操作：',
+
  extension_min_lnbits_version: '此版本要求最低的 LNbits 版本为',
+
  payment_hash: '付款哈希',
  fee: '费',
  amount: '金额',
-  tag: '标签',
  unit: '单位',
  description: '详情',
  expiry: '过期时间',
  webhook: 'Webhook',
-  payment_proof: '付款证明',
-  update_available: '更新%{version}可用！',
-  latest_update: '您当前使用的是最新版本%{version}。',
-  notifications: '通知',
-  no_notifications: '没有通知',
-  notifications_disabled: 'LNbits状态通知已禁用。',
-  enable_notifications: '启用通知',
-  enable_notifications_desc:
-    '如果启用，它将获取最新的LNbits状态更新，如安全事件和更新。',
-  enable_killswitch: '启用紧急停止开关',
-  enable_killswitch_desc:
-    '如果启用，当LNbits发送终止信号时，系统将自动将您的资金来源更改为VoidWallet。更新后，您将需要手动启用。',
-  killswitch_interval: 'Killswitch 间隔',
-  killswitch_interval_desc:
-    '后台任务应该多久检查一次来自状态源的LNBits断路信号（以分钟为单位）。',
-  enable_watchdog: '启用看门狗',
-  enable_watchdog_desc:
-    '如果启用，当您的余额低于LNbits余额时，系统将自动将您的资金来源更改为VoidWallet。更新后您将需要手动启用。',
-  watchdog_interval: '看门狗间隔',
-  watchdog_interval_desc:
-    '后台任务应该多久检查一次看门狗增量中的 killswitch 信号 [node_balance - lnbits_balance]（以分钟计）。',
-  watchdog_delta: '看门狗德尔塔',
-  watchdog_delta_desc:
-    '在触发紧急停止前切换资金来源至VoidWallet的限制 [lnbits_balance - node_balance > delta]',
-  status: '状态',
-  notification_source: '通知来源',
-  notification_source_label: '来源 URL（仅使用官方LNbits状态源和您信任的源）',
-  more: '更多',
-  less: '少',
-  releases: '版本',
-  killswitch: '杀手锏',
-  watchdog: '监控程序',
-  server_logs: '服务器日志',
-  ip_blocker: 'IP 阻止器',
-  security: '安全',
-  security_tools: '安全工具',
-  block_access_hint: '屏蔽IP访问',
-  allow_access_hint: '允许通过IP访问（将覆盖被屏蔽的IP）',
-  enter_ip: '输入IP地址并按回车键',
-  rate_limiter: '速率限制器',
-  wallet_limiter: '钱包限制器',
-  wallet_limit_max_withdraw_per_day:
-    '每日钱包最大提现额度（单位：sats）（设为0则禁用）',
-  wallet_max_ballance: '钱包最大余额（以sats计）（设为0则禁用）',
-  wallet_limit_secs_between_trans: '每个钱包交易间最少秒数（设为0则禁用）',
-  number_of_requests: '请求次数',
-  time_unit: '时间单位',
-  minute: '分钟',
-  second: '秒',
-  hour: '小时',
-  disable_server_log: '禁用服务器日志',
-  enable_server_log: '启用服务器日志',
-  coming_soon: '功能即将推出',
-  session_has_expired: '您的会话已过期。请重新登录。',
-  instant_access_question: '想要即时访问吗？',
-  login_with_user_id: '使用用户ID登录',
-  or: '或',
-  create_new_wallet: '创建新钱包',
-  login_to_account: '登录您的账户',
-  create_account: '创建账户',
-  account_settings: '账户设置',
-  signin_with_google: '使用谷歌账号登录',
-  signin_with_github: '使用GitHub登录',
-  signin_with_keycloak: '使用Keycloak登录',
-  username_or_email: '用户名或电子邮箱',
-  password: '密码',
-  password_config: '密码配置',
-  password_repeat: '密码重复',
-  change_password: '修改密码',
-  set_password: '设置密码',
-  invalid_password: '密码至少需要有8个字符',
-  login: '登录',
-  register: '注册',
-  username: '用户名',
-  user_id: '用户ID',
-  email: '电子邮件',
-  first_name: '名字',
-  last_name: '姓氏',
-  picture: '图片',
-  verify_email: '验证电子邮件与',
-  account: '账户',
-  update_account: '更新帐户',
-  invalid_username: '无效用户名',
-  auth_provider: '认证提供者',
-  my_account: '我的账户',
-  back: '返回',
-  logout: '注销',
-  look_and_feel: '外观和感觉',
-  language: '语言',
-  color_scheme: '配色方案'
+  payment_proof: '付款证明'
 }
@@ -1,242 +0,0 @@
-window.localisation.cs = {
-  confirm: 'Ano',
-  server: 'Server',
-  theme: 'Téma',
-  funding: 'Financování',
-  users: 'Uživatelé',
-  apps: 'Aplikace',
-  channels: 'Kanály',
-  transactions: 'Transakce',
-  dashboard: 'Přehled',
-  node: 'Uzel',
-  total_capacity: 'Celková kapacita',
-  avg_channel_size: 'Průmerná velikost kanálu',
-  biggest_channel_size: 'Největší velikost kanálu',
-  smallest_channel_size: 'Nejmenší velikost kanálu',
-  number_of_channels: 'Počet kanálů',
-  active_channels: 'Aktivní kanály',
-  connect_peer: 'Připojit peer',
-  connect: 'Připojit',
-  open_channel: 'Otevřít kanál',
-  open: 'Otevřít',
-  close_channel: 'Zavřít kanál',
-  close: 'Zavřít',
-  restart: 'Restartovat server',
-  save: 'Uložit',
-  save_tooltip: 'Uložit změny',
-  topup: 'Dobít',
-  topup_wallet: 'Dobít peněženku',
-  topup_hint: 'Použijte ID peněženky pro dobíjení jakékoliv peněženky',
-  restart_tooltip: 'Restartujte server pro aplikaci změn',
-  add_funds_tooltip: 'Přidat prostředky do peněženky.',
-  reset_defaults: 'Obnovit výchozí',
-  reset_defaults_tooltip: 'Smazat všechna nastavení a obnovit výchozí.',
-  download_backup: 'Stáhnout zálohu databáze',
-  name_your_wallet: 'Pojmenujte svou %{name} peněženku',
-  paste_invoice_label: 'Vložte fakturu, platební požadavek nebo lnurl kód *',
-  lnbits_description:
-    'Snadno nastavitelný a lehkotonážní, LNbits může běžet na jakémkoliv zdroji financování Lightning Network a dokonce LNbits samotné! LNbits můžete provozovat pro sebe, nebo snadno nabízet správu peněženek pro ostatní. Každá peněženka má své vlastní API klíče a není omezen počet peněženek, které můžete vytvořit. Možnost rozdělení prostředků dělá z LNbits užitečný nástroj pro správu peněz a jako vývojový nástroj. Rozšíření přidávají extra funkčnost k LNbits, takže můžete experimentovat s řadou špičkových technologií na lightning network. Vývoj rozšíření jsme učinili co nejjednodušší a jako svobodný a open-source projekt podporujeme lidi ve vývoji a zasílání vlastních rozšíření.',
-  export_to_phone: 'Exportovat do telefonu pomocí QR kódu',
-  export_to_phone_desc:
-    'Tento QR kód obsahuje URL vaší peněženky s plným přístupem. Můžete jej naskenovat z telefonu a otevřít peněženku odtamtud.',
-  wallets: 'Peněženky',
-  add_wallet: 'Přidat novou peněženku',
-  delete_wallet: 'Smazat peněženku',
-  delete_wallet_desc:
-    'Celá peněženka bude smazána, prostředky budou NEOBNOVITELNÉ.',
-  rename_wallet: 'Přejmenovat peněženku',
-  update_name: 'Aktualizovat název',
-  fiat_tracking: 'Sledování fiatu',
-  currency: 'Měna',
-  update_currency: 'Aktualizovat měnu',
-  press_to_claim: 'Stiskněte pro nárokování bitcoinu',
-  donate: 'Darovat',
-  view_github: 'Zobrazit na GitHubu',
-  voidwallet_active: 'VoidWallet je aktivní! Platby zakázány',
-  use_with_caution:
-    'POUŽÍVEJTE S OBEZŘETNOSTÍ - %{name} peněženka je stále v BETĚ',
-  service_fee: 'Servisný poplatek: %{amount} % za transakci',
-  service_fee_max:
-    'Servisný poplatek: %{amount} % za transakci (max %{max} satoshi)',
-  service_fee_tooltip:
-    'Servisní poplatek účtovaný správcem LNbits serveru za odchozí transakci',
-  toggle_darkmode: 'Přepnout tmavý režim',
-  payment_reactions: 'Reakce na platby',
-  view_swagger_docs: 'Zobrazit LNbits Swagger API dokumentaci',
-  api_docs: 'API dokumentace',
-  api_keys_api_docs: 'Adresa uzlu, API klíče a API dokumentace',
-  lnbits_version: 'Verze LNbits',
-  runs_on: 'Běží na',
-  credit_hint: 'Stiskněte Enter pro připsání na účet',
-  credit_label: '%{denomination} k připsání',
-  paste: 'Vložit',
-  paste_from_clipboard: 'Vložit ze schránky',
-  paste_request: 'Vložit požadavek',
-  create_invoice: 'Vytvořit fakturu',
-  camera_tooltip: 'Použijte kameru pro skenování faktury/QR',
-  export_csv: 'Exportovat do CSV',
-  chart_tooltip: 'Zobrazit graf',
-  pending: 'Čeká na vyřízení',
-  copy_invoice: 'Kopírovat fakturu',
-  withdraw_from: 'Vybrat z',
-  cancel: 'Zrušit',
-  scan: 'Skenovat',
-  read: 'Číst',
-  pay: 'Platit',
-  memo: 'Poznámka',
-  date: 'Datum',
-  processing_payment: 'Zpracování platby...',
-  not_enough_funds: 'Nedostatek prostředků!',
-  search_by_tag_memo_amount: 'Hledat podle tagu, poznámky, částky',
-  invoice_waiting: 'Faktura čeká na platbu',
-  payment_received: 'Platba přijata',
-  payment_sent: 'Platba odeslána',
-  receive: 'přijmout',
-  send: 'odeslat',
-  outgoing_payment_pending: 'Odchozí platba čeká na vyřízení',
-  drain_funds: 'Vyčerpat prostředky',
-  drain_funds_desc:
-    'Toto je LNURL-withdraw QR kód pro vyčerpání všeho z této peněženky. Nesdílejte s nikým. Je kompatibilní s balanceCheck a balanceNotify, takže vaše peněženka může kontinuálně čerpat prostředky odsud po prvním výběru.',
-  i_understand: 'Rozumím',
-  copy_wallet_url: 'Kopírovat URL peněženky',
-  disclaimer_dialog:
-    'Funkcionalita přihlášení bude vydána v budoucí aktualizaci, zatím si ujistěte, že jste si tuto stránku uložili do záložek pro budoucí přístup k vaší peněžence! Tato služba je v BETA verzi a nepřebíráme žádnou zodpovědnost za ztrátu přístupu k prostředkům.',
-  no_transactions: 'Zatím žádné transakce',
-  manage: 'Spravovat',
-  extensions: 'Rozšíření',
-  no_extensions: 'Nemáte nainstalováno žádné rozšíření :(',
-  created: 'Vytvořeno',
-  search_extensions: 'Hledat rozšíření',
-  warning: 'Varování',
-  repository: 'Repositář',
-  confirm_continue: 'Jste si jistí, že chcete pokračovat?',
-  manage_extension_details: 'Instalovat/odinstalovat rozšíření',
-  install: 'Instalovat',
-  uninstall: 'Odinstalovat',
-  drop_db: 'Odstranit data',
-  enable: 'Povolit',
-  enable_extension_details: 'Povolit rozšíření pro aktuálního uživatele',
-  disable: 'Zakázat',
-  installed: 'Nainstalováno',
-  activated: 'Aktivováno',
-  deactivated: 'Deaktivováno',
-  release_notes: 'Poznámky k vydání',
-  activate_extension_details: 'Zpřístupnit/zakázat rozšíření pro uživatele',
-  featured: 'Doporučené',
-  all: 'Vše',
-  only_admins_can_install:
-    '(Pouze administrátorské účty mohou instalovat rozšíření)',
-  admin_only: 'Pouze pro adminy',
-  new_version: 'Nová verze',
-  extension_depends_on: 'Závisí na:',
-  extension_rating_soon: 'Hodnocení brzy dostupné',
-  extension_installed_version: 'Nainstalovaná verze',
-  extension_uninstall_warning:
-    'Chystáte se odstranit rozšíření pro všechny uživatele.',
-  uninstall_confirm: 'Ano, odinstalovat',
-  extension_db_drop_info:
-    'Všechna data pro rozšíření budou trvale odstraněna. Tuto operaci nelze vrátit zpět!',
-  extension_db_drop_warning:
-    'Chystáte se odstranit všechna data pro rozšíření. Prosím, pokračujte zadáním názvu rozšíření:',
-  extension_min_lnbits_version: 'Toto vydání vyžaduje alespoň verzi LNbits',
-  payment_hash: 'Hash platby',
-  fee: 'Poplatek',
-  amount: 'Částka',
-  tag: 'Tag',
-  unit: 'Jednotka',
-  description: 'Popis',
-  expiry: 'Expirace',
-  webhook: 'Webhook',
-  payment_proof: 'Důkaz platby',
-  update_available: 'Dostupná aktualizace %{version}!',
-  latest_update: 'Máte nejnovější verzi %{version}.',
-  notifications: 'Notifikace',
-  no_notifications: 'Žádné notifikace',
-  notifications_disabled: 'Notifikace stavu LNbits jsou zakázány.',
-  enable_notifications: 'Povolit notifikace',
-  enable_notifications_desc:
-    'Pokud je povoleno, bude stahovat nejnovější aktualizace stavu LNbits, jako jsou bezpečnostní incidenty a aktualizace.',
-  enable_killswitch: 'Povolit Killswitch',
-  enable_killswitch_desc:
-    'Pokud je povoleno, automaticky změní zdroj financování na VoidWallet pokud LNbits odešle signál killswitch. Po aktualizaci budete muset povolit ručně.',
-  killswitch_interval: 'Interval Killswitch',
-  killswitch_interval_desc:
-    'Jak často by měl úkol na pozadí kontrolovat signál killswitch od LNBits ze zdroje stavu (v minutách).',
-  enable_watchdog: 'Povolit Watchdog',
-  enable_watchdog_desc:
-    'Pokud je povoleno, automaticky změní zdroj financování na VoidWallet pokud je váš zůstatek nižší než zůstatek LNbits. Po aktualizaci budete muset povolit ručně.',
-  watchdog_interval: 'Interval Watchdog',
-  watchdog_interval_desc:
-    'Jak často by měl úkol na pozadí kontrolovat signál killswitch v watchdog delta [node_balance - lnbits_balance] (v minutách).',
-  watchdog_delta: 'Delta Watchdog',
-  watchdog_delta_desc:
-    'Limit předtím, než killswitch změní zdroj financování na VoidWallet [lnbits_balance - node_balance > delta]',
-  status: 'Stav',
-  notification_source: 'Zdroj notifikací',
-  notification_source_label:
-    'URL zdroje (používejte pouze oficiální zdroj stavu LNbits a zdroje, kterým můžete věřit)',
-  more: 'více',
-  less: 'méně',
-  releases: 'Vydání',
-  killswitch: 'Killswitch',
-  watchdog: 'Watchdog',
-  server_logs: 'Logy serveru',
-  ip_blocker: 'Blokování IP',
-  security: 'Bezpečnost',
-  security_tools: 'Nástroje bezpečnosti',
-  block_access_hint: 'Blokovat přístup podle IP',
-  allow_access_hint: 'Povolit přístup podle IP (přepíše blokované IP)',
-  enter_ip: 'Zadejte IP a stiskněte enter',
-  rate_limiter: 'Omezovač počtu požadavků',
-  wallet_limiter: 'Omezení peněženky',
-  wallet_limit_max_withdraw_per_day:
-    'Maximální denní limit pro výběr z peněženky v sats (0 pro deaktivaci)',
-  wallet_max_ballance: 'Maximální zůstatek v peněžence v sats (0 pro zakázání)',
-  wallet_limit_secs_between_trans:
-    'Minimální počet sekund mezi transakcemi na peněženku (0 pro vypnutí)',
-  number_of_requests: 'Počet požadavků',
-  time_unit: 'Časová jednotka',
-  minute: 'minuta',
-  second: 'sekunda',
-  hour: 'hodina',
-  disable_server_log: 'Zakázat log serveru',
-  enable_server_log: 'Povolit log serveru',
-  coming_soon: 'Funkce brzy dostupná',
-  session_has_expired: 'Vaše relace vypršela. Prosím, přihlašte se znovu.',
-  instant_access_question: 'Chcete okamžitý přístup?',
-  login_with_user_id: 'Přihlásit se s uživatelským ID',
-  or: 'nebo',
-  create_new_wallet: 'Vytvořit novou peněženku',
-  login_to_account: 'Přihlaste se ke svému účtu',
-  create_account: 'Vytvořit účet',
-  account_settings: 'Nastavení účtu',
-  signin_with_google: 'Přihlásit se přes Google',
-  signin_with_github: 'Přihlásit se přes GitHub',
-  signin_with_keycloak: 'Přihlásit se přes Keycloak',
-  username_or_email: 'Uživatelské jméno nebo Email',
-  password: 'Heslo',
-  password_config: 'Konfigurace hesla',
-  password_repeat: 'Opakujte heslo',
-  change_password: 'Změnit heslo',
-  set_password: 'Nastavit heslo',
-  invalid_password: 'Heslo musí mít alespoň 8 znaků',
-  login: 'Přihlášení',
-  register: 'Registrovat',
-  username: 'Uživatelské jméno',
-  user_id: 'ID uživatele',
-  email: 'Email',
-  first_name: 'Křestní jméno',
-  last_name: 'Příjmení',
-  picture: 'Obrázek',
-  verify_email: 'Ověřte e-mail s',
-  account: 'Účet',
-  update_account: 'Aktualizovat účet',
-  invalid_username: 'Neplatné uživatelské jméno',
-  auth_provider: 'Poskytovatel ověření',
-  my_account: 'Můj účet',
-  back: 'Zpět',
-  logout: 'Odhlásit se',
-  look_and_feel: 'Vzhled a chování',
-  language: 'Jazyk',
-  color_scheme: 'Barevné schéma'
-}
@@ -1,26 +1,9 @@
 window.localisation.de = {
-  confirm: 'Ja',
  server: 'Server',
  theme: 'Theme',
  funding: 'Funding',
  users: 'Benutzer',
-  apps: 'Apps',
-  channels: 'Kanäle',
-  transactions: 'Transaktionen',
-  dashboard: 'Armaturenbrett',
-  node: 'Knoten',
-  total_capacity: 'Gesamtkapazität',
-  avg_channel_size: 'Durchschn. Kanalgröße',
-  biggest_channel_size: 'Größte Kanalgröße',
-  smallest_channel_size: 'Kleinste Kanalgröße',
-  number_of_channels: 'Anzahl der Kanäle',
-  active_channels: 'Aktive Kanäle',
-  connect_peer: 'Peer verbinden',
-  connect: 'Verbinden',
-  open_channel: 'Offener Kanal',
-  open: 'Öffnen',
-  close_channel: 'Kanal schließen',
-  close: 'Schließen',
+  unit: 'Einheit',
  restart: 'Server neu starten',
  save: 'Speichern',
  save_tooltip: 'Änderungen speichern',
@@ -37,7 +20,7 @@ window.localisation.de = {
  paste_invoice_label:
    'Füge eine Rechnung, Zahlungsanforderung oder LNURL ein *',
  lnbits_description:
-    'Einfach zu installieren und kompakt, LNbits kann auf jeder Funding-Quelle im Lightning Netzwerk aufsetzen und sogar LNbits selbst! Du kannst LNbits für dich selbst betreiben oder anderen die Verwaltung durch dich anbieten. Jede Wallet hat ihre eigenen API-Schlüssel und die Anzahl der Wallets ist unbegrenzt. Die Möglichkeit, Gelder auf verschiedene Accounts mit unterschiedlicher Logik aufteilen zu können macht LNbits zu einem nützlichen Werkzeug für deine Buchhaltung - aber auch als Entwicklungswerkzeug. Erweiterungen bereichern LNbits Accounts um zusätzliche Funktionalität, so dass du mit einer Reihe von neuartigen Technologien auf dem Lightning-Netzwerk experimentieren kannst. Wir haben es so einfach wie möglich gemacht, Erweiterungen zu entwickeln, und als freies und Open-Source-Projekt möchten wir Menschen ermutigen, sich selbst hieran zu versuchen und gemeinsam mit uns neue Funktionalitäten zu entwickeln.',
+    'Einfach zu installieren und kompakt, LNbits kann auf jeder Funding-Quelle im Lightning Netzwerk aufsetzen. Derzeit unterstützt: LND, Core Lightning, OpenNode, LNPay und sogar LNbits selbst! Du kannst LNbits für dich selbst betreiben oder anderen die Verwaltung durch dich anbieten. Jede Wallet hat ihre eigenen API-Schlüssel und die Anzahl der Wallets ist unbegrenzt. Die Möglichkeit, Gelder auf verschiedene Accounts mit unterschiedlicher Logik aufteilen zu können macht LNbits zu einem nützlichen Werkzeug für deine Buchhaltung - aber auch als Entwicklungswerkzeug. Erweiterungen bereichern LNbits Accounts um zusätzliche Funktionalität, so dass du mit einer Reihe von neuartigen Technologien auf dem Lightning-Netzwerk experimentieren kannst. Wir haben es so einfach wie möglich gemacht, Erweiterungen zu entwickeln, und als freies und Open-Source-Projekt möchten wir Menschen ermutigen, sich selbst hieran zu versuchen und gemeinsam mit uns neue Funktionalitäten zu entwickeln.',
  export_to_phone: 'Auf dem Telefon öffnen',
  export_to_phone_desc:
    'Dieser QR-Code beinhaltet vollständige Rechte auf deine Wallet. Du kannst den QR-Code mit Deinem Telefon scannen, um deine Wallet dort zu öffnen.',
@@ -48,40 +31,28 @@ window.localisation.de = {
    'Die Wallet wird gelöscht, die hierin beinhalteten Daten hierin oder innerhalb einer Erweiterung sind UNWIEDERBRINGLICH.',
  rename_wallet: 'Wallet umbenennen',
  update_name: 'Namen aktualisieren',
-  fiat_tracking: 'Fiat-Tracking',
-  currency: 'Währung',
-  update_currency: 'Währung aktualisieren',
  press_to_claim: 'Klicken, um Bitcoin einzufordern.',
  donate: 'Spenden',
  view_github: 'Auf GitHub anzeigen',
  voidwallet_active: 'VoidWallet ist aktiv! Zahlungen deaktiviert',
  use_with_caution:
    'BITTE MIT VORSICHT BENUTZEN - %{name} Wallet ist noch BETA',
-  service_fee: 'Dienstleistungsgebühr: %{amount} % pro Transaktion',
-  service_fee_max:
-    'Servicegebühr: %{amount} % pro Transaktion (max %{max} Sats)',
-  service_fee_tooltip:
-    'Bearbeitungsgebühr, die vom LNbits Server-Administrator pro ausgehender Transaktion berechnet wird',
  toggle_darkmode: 'Auf Dark Mode umschalten',
-  payment_reactions: 'Zahlungsreaktionen',
-  view_swagger_docs: 'LNbits Swagger API-Dokumentation',
-  api_docs: 'API-Dokumentation',
-  api_keys_api_docs: 'Knoten-URL, API-Schlüssel und API-Dokumentation',
-  lnbits_version: 'LNbits-Version',
+  view_swagger_docs: 'LNbits Swagger API-Dokumente',
+  api_docs: 'API docs',
  runs_on: 'Läuft auf',
  credit_hint: 'Klicke Enter, um das Konto zu belasten',
  credit_label: '%{denomination} zu belasten',
-  paste: 'Einfügen',
-  paste_from_clipboard: 'Einfügen aus der Zwischenablage',
  paste_request: 'Anfrage einfügen',
  create_invoice: 'Rechnung erstellen',
  camera_tooltip:
    'Verwende die Kamera, um eine Rechnung oder einen QR-Code zu scannen',
  export_csv: 'Exportieren als CSV',
+  transactions: 'Transaktionen',
  chart_tooltip: 'Diagramm anzeigen',
  pending: 'Ausstehend',
  copy_invoice: 'Rechnung kopieren',
-  withdraw_from: 'Abheben von',
+  close: 'Schließen',
  cancel: 'Stornieren',
  scan: 'Scannen',
  read: 'Lesen',
@@ -105,18 +76,21 @@ window.localisation.de = {
  disclaimer_dialog:
    'Login-Funktionalität wird in einem zukünftigen Update veröffentlicht. Bis dahin ist die Speicherung der Wallet-URL als Lesezeichen absolut notwendig, um Zugriff auf die Wallet zu erhalten! Dieser Service ist in BETA und wir übernehmen keine Verantwortung für Verluste durch verlorene Zugriffe.',
  no_transactions: 'Keine Transaktionen',
-  manage: 'Verwalten',
+  manage_extensions: 'Erweiterungen verwalten',
+  manage_server: 'Server verwalten',
  extensions: 'Erweiterungen',
  no_extensions: 'Du hast noch keine Erweiterungen installiert :(',
  created: 'Erstellt',
+
  search_extensions: 'Sucherweiterungen',
  warning: 'Warnung',
+  manage: 'Verwalten',
  repository: 'Repository',
  confirm_continue: 'Bist du sicher, dass du fortfahren möchtest?',
  manage_extension_details: 'Erweiterung installieren/deinstallieren',
  install: 'Installieren',
  uninstall: 'Deinstallieren',
-  drop_db: 'Daten löschen',
+  open: 'Öffnen',
  enable: 'Aktivieren',
  enable_extension_details: 'Erweiterung für aktuellen Benutzer aktivieren',
  disable: 'Deaktivieren',
@@ -130,7 +104,6 @@ window.localisation.de = {
  all: 'Alle',
  only_admins_can_install:
    '(Nur Administratorkonten können Erweiterungen installieren)',
-  admin_only: 'Nur für Admins',
  new_version: 'Neue Version',
  extension_depends_on: 'Hängt ab von:',
  extension_rating_soon: 'Bewertungen sind bald verfügbar',
@@ -138,112 +111,14 @@ window.localisation.de = {
  extension_uninstall_warning:
    'Sie sind dabei, die Erweiterung für alle Benutzer zu entfernen.',
  uninstall_confirm: 'Ja, deinstallieren',
-  extension_db_drop_info:
-    'Alle Daten für die Erweiterung werden dauerhaft gelöscht. Es gibt keine Möglichkeit, diesen Vorgang rückgängig zu machen!',
-  extension_db_drop_warning:
-    'Sie sind dabei, alle Daten für die Erweiterung zu entfernen. Bitte geben Sie den Namen der Erweiterung ein, um fortzufahren:',
  extension_min_lnbits_version:
    'Diese Version erfordert mindestens die LNbits-Version',
+
  payment_hash: 'Zahlungs-Hash',
  fee: 'Gebühr',
  amount: 'Menge',
-  tag: 'Tag',
-  unit: 'Einheit',
  description: 'Beschreibung',
  expiry: 'Ablauf',
  webhook: 'Webhook',
-  payment_proof: 'Beleg',
-  update_available: 'Aktualisierung %{version} verfügbar!',
-  latest_update: 'Sie sind auf der neuesten Version %{version}.',
-  notifications: 'Benachrichtigungen',
-  no_notifications: 'Keine Benachrichtigungen',
-  notifications_disabled: 'LNbits Statusbenachrichtigungen sind deaktiviert.',
-  enable_notifications: 'Aktiviere Benachrichtigungen',
-  enable_notifications_desc:
-    'Wenn aktiviert, werden die neuesten LNbits-Statusaktualisierungen, wie Sicherheitsvorfälle und Updates, abgerufen.',
-  enable_killswitch: 'Aktivieren Sie den Notausschalter',
-  enable_killswitch_desc:
-    'Falls aktiviert, wird Ihre Zahlungsquelle automatisch auf VoidWallet umgestellt, wenn LNbits ein Killswitch-Signal sendet. Nach einem Update müssen Sie dies manuell wieder aktivieren.',
-  killswitch_interval: 'Intervall für den Notausschalter',
-  killswitch_interval_desc:
-    'Wie oft die Hintergrundaufgabe nach dem LNBits-Killswitch-Signal aus der Statusquelle suchen soll (in Minuten).',
-  enable_watchdog: 'Aktiviere Watchdog',
-  enable_watchdog_desc:
-    'Wenn aktiviert, wird Ihre Zahlungsquelle automatisch auf VoidWallet umgestellt, wenn Ihr Guthaben niedriger als das LNbits-Guthaben ist. Nach einem Update müssen Sie dies manuell aktivieren.',
-  watchdog_interval: 'Überwachungszeitintervall',
-  watchdog_interval_desc:
-    'Wie oft die Hintergrundaufgabe nach einem Abschaltsignal im Wachhund-Delta [node_balance - lnbits_balance] suchen soll (in Minuten).',
-  watchdog_delta: 'Watchdog Delta',
-  watchdog_delta_desc:
-    'Limit, bevor der Notausschalter die Finanzierungsquelle auf VoidWallet ändert [lnbits_balance - node_balance > delta]',
-  status: 'Status',
-  notification_source: 'Benachrichtigungsquelle',
-  notification_source_label:
-    'Quell-URL (verwenden Sie nur die offizielle LNbits-Statusquelle und Quellen, denen Sie vertrauen können)',
-  more: 'mehr',
-  less: 'weniger',
-  releases: 'Veröffentlichungen',
-  killswitch: 'Killswitch',
-  watchdog: 'Wachhund',
-  server_logs: 'Serverprotokolle',
-  ip_blocker: 'IP-Sperre',
-  security: 'Sicherheit',
-  security_tools: 'Sicherheitstools',
-  block_access_hint: 'Zugriff per IP sperren',
-  allow_access_hint: 'Zugriff durch IP erlauben (überschreibt blockierte IPs)',
-  enter_ip: 'Geben Sie die IP ein und drücken Sie die Eingabetaste',
-  rate_limiter: 'Ratenbegrenzer',
-  wallet_limiter: 'Geldbeutel-Limiter',
-  wallet_limit_max_withdraw_per_day:
-    'Maximales tägliches Wallet-Auszahlungslimit in Sats (0 zum Deaktivieren)',
-  wallet_max_ballance:
-    'Maximales Guthaben der Wallet in Sats (0 zum Deaktivieren)',
-  wallet_limit_secs_between_trans:
-    'Mindestsekunden zwischen Transaktionen pro Wallet (0 zum Deaktivieren)',
-  number_of_requests: 'Anzahl der Anfragen',
-  time_unit: 'Zeiteinheit',
-  minute: 'Minute',
-  second: 'Sekunde',
-  hour: 'Stunde',
-  disable_server_log: 'Server-Log deaktivieren',
-  enable_server_log: 'Serverprotokollierung aktivieren',
-  coming_soon: 'Funktion demnächst verfügbar',
-  session_has_expired:
-    'Ihre Sitzung ist abgelaufen. Bitte melden Sie sich erneut an.',
-  instant_access_question: 'Möchten Sie sofortigen Zugang?',
-  login_with_user_id: 'Mit Benutzer-ID anmelden',
-  or: 'oder',
-  create_new_wallet: 'Neue Geldbörse erstellen',
-  login_to_account: 'Melden Sie sich bei Ihrem Konto an',
-  create_account: 'Konto erstellen',
-  account_settings: 'Kontoeinstellungen',
-  signin_with_google: 'Mit Google anmelden',
-  signin_with_github: 'Anmelden mit GitHub',
-  signin_with_keycloak: 'Mit Keycloak anmelden',
-  username_or_email: 'Benutzername oder E-Mail',
-  password: 'Passwort',
-  password_config: 'Passwortkonfiguration',
-  password_repeat: 'Passwortwiederholung',
-  change_password: 'Passwort ändern',
-  set_password: 'Passwort festlegen',
-  invalid_password: 'Das Passwort muss mindestens 8 Zeichen haben.',
-  login: 'Anmelden',
-  register: 'Registrieren',
-  username: 'Benutzername',
-  user_id: 'Benutzer-ID',
-  email: 'E-Mail',
-  first_name: 'Vorname',
-  last_name: 'Nachname',
-  picture: 'Bild',
-  verify_email: 'E-Mail verifizieren mit',
-  account: 'Konto',
-  update_account: 'Konto aktualisieren',
-  invalid_username: 'Ungültiger Benutzername',
-  auth_provider: 'Anbieter für Authentifizierung',
-  my_account: 'Mein Konto',
-  back: 'Zurück',
-  logout: 'Abmelden',
-  look_and_feel: 'Aussehen und Verhalten',
-  language: 'Sprache',
-  color_scheme: 'Farbschema'
+  payment_proof: 'Beleg'
 }
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 101.041 30.0001"><defs><path id="a" d="M33.2619 148.1667h154.2143v68.7917H33.2619z"/></defs><g fill="#1f2234" aria-label="LNbits" font-family="sans-serif" font-size=".3095" font-weight="400" letter-spacing=".0031" style="line-height:1.25;white-space:pre;shape-inside:url(#a)" transform="matrix(72.4607 0 0 72.4607 -2399.2814 -10741.3589)"><g transform="matrix(.00244 0 0 .00244 33.0708 148.1594)"><circle cx="101.2976" cy="116.4167" r="84.6667" fill="#673ab7" fill-rule="evenodd"/><path fill="#eee" d="M79.1105 71.9667v49.0613h13.3803v40.141l31.2208-53.5213h-17.8404l17.8404-35.681z"/></g><g fill="#eee" font-family="roboto"><path d="M33.6755 148.518h.0962v.0364h-.1416v-.22h.0454zM33.9796 148.5544h-.0453l-.0883-.1448v.1448h-.0453v-.22h.0453l.0884.145v-.145h.0452z" font-weight="700" style="-inkscape-font-specification:'roboto Bold'"/><path d="M34.1625 148.4744q0 .0375-.0172.0603-.0172.0227-.0462.0227-.031 0-.048-.0219l-.0014.019h-.0256v-.2322h.028v.0866q.0168-.021.0466-.021.0298 0 .0467.0225.017.0225.017.0617zm-.028-.003q0-.0286-.011-.044-.011-.0157-.0317-.0157-.0277 0-.0398.0257v.0707q.0129.0257.04.0257.0202 0 .0314-.0156.0112-.0156.0112-.0469zM34.231 148.5544h-.028v-.1635h.028zm-.0302-.2069q0-.007.0041-.0115.0042-.005.0124-.005.0082 0 .0124.005.0042.005.0042.0115 0 .007-.0042.0113-.0042.005-.0124.005-.0082 0-.0124-.005-.004-.005-.004-.0113zM34.3167 148.3513v.0396h.0305v.0216h-.0305v.1014q0 .01.004.0148.0042.005.014.005.0048 0 .0133-.002v.0227q-.011.003-.0215.003-.0187 0-.0283-.0113-.0095-.0113-.0095-.0322v-.1014h-.0297v-.0216h.0297v-.0396zM34.478 148.511q0-.0113-.0086-.0175-.0085-.006-.0298-.0109-.0211-.005-.0337-.0109-.0124-.006-.0184-.015t-.006-.0209q0-.02.017-.034.017-.0139.0435-.0139.0278 0 .045.0144.0174.0144.0174.0367h-.028q0-.0115-.0099-.0198-.0097-.008-.0245-.008-.0152 0-.0238.007-.0086.007-.0086.0174 0 .0101.008.0153.008.005.0288.01.021.005.034.0112.013.007.0192.0157.0063.009.0063.0222 0 .022-.0175.0352-.0175.0131-.0455.0131-.0197 0-.0348-.007-.015-.007-.0237-.0193-.0085-.0125-.0085-.027h.028q.0007.014.0111.0223.0106.008.0279.008.0158 0 .0253-.006.0097-.006.0097-.0172z" style="-inkscape-font-specification:roboto"/></g></g></svg>