clean

fundle
Merge remote-tracking branch 'origin/dev' into wasm_extensions
2026-02-25 22:24:22 +00:00 · 2026-02-25 22:08:00 +00:00 · 2026-02-25 21:30:24 +00:00 · 2026-02-25 21:05:28 +00:00 · 2026-02-25 16:20:26 +00:00 · 2026-02-25 16:11:14 +00:00
298 changed files with 40613 additions and 24472 deletions
@@ -23,3 +23,10 @@ mypy.ini
 package-lock.json
 package.json
 pytest.ini
+
+.mypy_cache
+.github
+.pytest_cache
+.vscode
+bin
+dist
@@ -6,6 +6,10 @@
 # The following settings are ONLY set in your .env file.
 # They are NOT managed by the Admin UI and are not stored in the database.

+# === First Install Token ===
+# if set the user is required to enter this token on the /first_install page
+# FIRST_INSTALL_TOKEN="myaccesstoken"
+
 # === Logging and Development ===

 DEBUG=False
@@ -18,7 +22,6 @@ 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

@@ -56,7 +59,7 @@ LNBITS_EXTENSIONS_DEFAULT_INSTALL="tpos"
 # LNBITS_EXT_GITHUB_TOKEN=github_pat_xxxxxxxxxxxxxxxxxx

 # which fundingsources are allowed in the admin ui
-# LNBITS_ALLOWED_FUNDING_SOURCES="VoidWallet, FakeWallet, CoreLightningWallet, CoreLightningRestWallet, LndRestWallet, EclairWallet, LndWallet, LnTipsWallet, LNPayWallet, LNbitsWallet, BlinkWallet, AlbyWallet, ZBDWallet, PhoenixdWallet, OpenNodeWallet, NWCWallet, BreezSdkWallet, BoltzWallet, StrikeWallet, CLNRestWallet"
+# LNBITS_ALLOWED_FUNDING_SOURCES="VoidWallet, FakeWallet, CoreLightningWallet, CoreLightningRestWallet, LndRestWallet, EclairWallet, LndWallet, LnTipsWallet, LNPayWallet, LNbitsWallet, BlinkWallet, AlbyWallet, ZBDWallet, PhoenixdWallet, OpenNodeWallet, NWCWallet, BreezSdkWallet, BoltzWallet, StrikeWallet, CLNRestWallet, SparkWallet, SparkL2Wallet"

 # uvicorn variable, allow https behind a proxy
 # IMPORTANT: this also needs the webserver to be configured to forward the headers
@@ -67,6 +70,7 @@ FORWARDED_ALLOW_IPS="*"
 # Inside this directory the `extensions` and `upgrades` sub-directories will be created.
 # LNBITS_EXTENSIONS_PATH="/path/to/some/dir"

+
 # ID of the super user. The user ID must exist.
 # SUPER_USER=""

@@ -187,7 +191,8 @@ BOLTZ_CLIENT_ENDPOINT=127.0.0.1:9002
 BOLTZ_CLIENT_MACAROON="/home/bob/.boltz/macaroons/admin.macaroon"
 # HEXSTRING instead of path also possible
 BOLTZ_CLIENT_CERT="/home/bob/.boltz/tls.cert"
-BOLTZ_CLIENT_WALLET="lnbits"
+
+# TODO: add Spark

 # StrikeWallet
 STRIKE_API_ENDPOINT=https://api.strike.me/v1
@@ -333,4 +338,3 @@ LNBITS_RESERVE_FEE_PERCENT=1.0
 ######################################
 ###### Logging and Development #######
 ######################################
-
@@ -75,7 +75,14 @@ jobs:
    strategy:
      matrix:
        python-version: ["3.10"]
-        backend-wallet-class: ["LndRestWallet", "LndWallet", "CoreLightningWallet", "CoreLightningRestWallet", "LNbitsWallet", "EclairWallet"]
+        backend-wallet-class:
+          - BoltzWallet
+          - LndRestWallet
+          - LndWallet
+          - CoreLightningWallet
+          - CoreLightningRestWallet
+          - LNbitsWallet
+          - EclairWallet
    with:
      custom-pytest: "uv run pytest tests/regtest"
      python-version: ${{ matrix.python-version }}
@@ -55,10 +55,21 @@ jobs:
      - name: Build and push boltz
        uses: docker/build-push-action@v5
        with:
-            context: .
-            file: Dockerfile.boltz
+            context: docker/boltzclient
            push: true
            tags: ${{ secrets.DOCKER_USERNAME }}/lnbits-boltz:${{ inputs.tag }}
            platforms: linux/amd64,linux/arm64
            cache-from: type=local,src=/tmp/.buildx-cache
            cache-to: type=local,dest=/tmp/.buildx-cache
+            build-args: LNBITS_TAG=${{ inputs.tag }}
+
+      - name: Build and push sparkl2
+        uses: docker/build-push-action@v5
+        with:
+            context: docker/sparkl2
+            push: true
+            tags: ${{ secrets.DOCKER_USERNAME }}/lnbits-sparkl2:${{ inputs.tag }}
+            platforms: linux/amd64,linux/arm64
+            cache-from: type=local,src=/tmp/.buildx-cache
+            cache-to: type=local,dest=/tmp/.buildx-cache
+            build-args: LNBITS_TAG=${{ inputs.tag }}
@@ -38,10 +38,9 @@ jobs:

      - name: Setup Regtest
        run: |
-          git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
-          cd docker
-          chmod +x ./tests
-          ./tests
+          cd docker/regtest
+          chmod +x ./start-regtest
+          ./start-regtest
          sudo chmod -R a+rwx .

      - name: Run pytest
@@ -50,19 +49,21 @@ jobs:
          LNBITS_DATABASE_URL: ${{ inputs.db-url }}
          LNBITS_BACKEND_WALLET_CLASS: ${{ inputs.backend-wallet-class }}
          LND_REST_ENDPOINT: https://localhost:8081/
-          LND_REST_CERT: ./docker/data/lnd-3/tls.cert
-          LND_REST_MACAROON: ./docker/data/lnd-3/data/chain/bitcoin/regtest/admin.macaroon
+          LND_REST_CERT: ./docker/regtest/data/lnd-3/tls.cert
+          LND_REST_MACAROON: ./docker/regtest/data/lnd-3/data/chain/bitcoin/regtest/admin.macaroon
          LND_GRPC_ENDPOINT: localhost
          LND_GRPC_PORT: 10009
-          LND_GRPC_CERT: docker/data/lnd-3/tls.cert
-          LND_GRPC_MACAROON: docker/data/lnd-3/data/chain/bitcoin/regtest/admin.macaroon
-          CORELIGHTNING_RPC: ./docker/data/clightning-1/regtest/lightning-rpc
+          LND_GRPC_CERT: ./docker/regtest/data/lnd-3/tls.cert
+          LND_GRPC_MACAROON: ./docker/regtest/data/lnd-3/data/chain/bitcoin/regtest/admin.macaroon
+          CORELIGHTNING_RPC: ./docker/regtest/data/clightning-1/regtest/lightning-rpc
          CORELIGHTNING_REST_URL: https://localhost:3001
-          CORELIGHTNING_REST_MACAROON: ./docker/data/clightning-2-rest/access.macaroon
-          CORELIGHTNING_REST_CERT: ./docker/data/clightning-2-rest/certificate.pem
+          CORELIGHTNING_REST_MACAROON: ./docker/regtest/data/clightning-2-rest/access.macaroon
+          CORELIGHTNING_REST_CERT: ./docker/regtest/data/clightning-2-rest/certificate.pem
          LNBITS_ENDPOINT: http://localhost:5001
          LNBITS_KEY: "d08a3313322a4514af75d488bcc27eee"
          ECLAIR_URL: http://127.0.0.1:8082
+          BOLTZ_CLIENT_ENDPOINT: 127.0.0.1:9002
+          BOLTZ_MNEMONIC: abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about
          LNBITS_MAX_OUTGOING_PAYMENT_AMOUNT_SATS: 1000000000
          LNBITS_MAX_INCOMING_PAYMENT_AMOUNT_SATS: 1000000000
          ECLAIR_PASS: lnbits
@@ -10,7 +10,29 @@ permissions:

 jobs:

+  release:
+    runs-on: ubuntu-24.04
+    outputs:
+      upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Create github pre-release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ github.ref_name }}
+        run: |
+          gh release create "$tag" --prerelease --generate-notes --draft
+      - id: get_upload_url
+        name: Get upload url of Github release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ github.ref_name }}
+        run: |
+          upload_url=$(gh release view "$tag" --json uploadUrl -q ".uploadUrl")
+          echo "upload_url=$upload_url" >> "$GITHUB_OUTPUT"
+
  docker:
+    if: github.repository == 'lnbits/lnbits'
    uses: ./.github/workflows/docker.yml
    with:
      tag: ${{ github.ref_name }}
@@ -19,14 +41,26 @@ jobs:
      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}

  pypi:
+    if: github.repository == 'lnbits/lnbits'
    runs-on: ubuntu-24.04
    steps:
-      - name: Install dependencies for building secp256k1
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y build-essential automake libtool libffi-dev libgmp-dev
      - uses: actions/checkout@v4
-      - name: Build and publish to pypi
-        uses: JRubics/poetry-publish@v1.15
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
        with:
-          pypi_token: ${{ secrets.PYPI_API_KEY }}
+          python-version: "3.10"
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+      - name: Build the project
+        run: uv build
+      - name: Publish to pypi
+        env:
+          UV_PUBLISH_TOKEN: ${{ secrets.PYPI_API_KEY }}
+        run: uv publish
+
+  appimage:
+    needs: [ release ]
+    uses: ./.github/workflows/appimage.yml
+    with:
+      tag_name: ${{ github.ref_name }}
+      upload_url: ${{ needs.release.outputs.upload_url }}
@@ -14,7 +14,7 @@ jobs:
  release:
    runs-on: ubuntu-24.04
    outputs:
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
+      upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
    steps:
      - uses: actions/checkout@v4
      - name: Create github release
@@ -22,10 +22,18 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          tag: ${{ github.ref_name }}
        run: |
-          upload_url=$(gh release create "$tag" --generate-notes --draft --json upload_url -q '.upload_url')
+          gh release create "$tag" --generate-notes --draft
+      - id: get_upload_url
+        name: Get upload url of Github release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ github.ref_name }}
+        run: |
+          upload_url=$(gh release view "$tag" --json uploadUrl -q ".uploadUrl")
          echo "upload_url=$upload_url" >> "$GITHUB_OUTPUT"

  docker:
+    if: github.repository == 'lnbits/lnbits'
    needs: [ release ]
    uses: ./.github/workflows/docker.yml
    with:
@@ -35,6 +43,7 @@ jobs:
      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}

  docker-latest:
+    if: github.repository == 'lnbits/lnbits'
    needs: [ release ]
    uses: ./.github/workflows/docker.yml
    with:
@@ -44,17 +53,22 @@ jobs:
      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}

  pypi:
+    if: github.repository == 'lnbits/lnbits'
    runs-on: ubuntu-24.04
    steps:
-      - name: Install dependencies for building secp256k1
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y build-essential automake libtool libffi-dev libgmp-dev
      - uses: actions/checkout@v4
-      - name: Build and publish to pypi
-        uses: JRubics/poetry-publish@v1.15
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
        with:
-          pypi_token: ${{ secrets.PYPI_API_KEY }}
+          python-version: "3.10"
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+      - name: Build the project
+        run: uv build
+      - name: Publish to pypi
+        env:
+          UV_PUBLISH_TOKEN: ${{ secrets.PYPI_API_KEY }}
+        run: uv publish

  appimage:
    needs: [ release ]
@@ -42,7 +42,6 @@ lnbits/static/bundle.min.js.old
 lnbits/static/bundle.min.css.old
 lnbits/static/bundle-components.min.js.old
 lnbits/upgrades
-docker

 # Nix
 *result*
@@ -23,7 +23,7 @@ repos:
      - id: ruff
        args: [ --fix, --exit-non-zero-on-fix ]
  - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.6.2
+    rev: v3.7.4
    hooks:
      - id: prettier
        types_or: [css, javascript, html, json]
@@ -5,8 +5,9 @@
  </picture>
 </a>

-![phase: stable](https://img.shields.io/badge/phase-stable-2EA043) [![license-badge]](LICENSE) [![docs-badge]][docs] ![PRs: welcome](https://img.shields.io/badge/PRs-Welcome-yellow) [![explore: LNbits extensions](https://img.shields.io/badge/explore-LNbits%20extensions-10B981)](https://extensions.lnbits.com/) [![hardware: LNBitsShop](https://img.shields.io/badge/hardware-LNBitsShop-7C3AED)](https://shop.lnbits.com/) [<img src="https://img.shields.io/badge/community_chat-Telegram-24A1DE">](https://t.me/lnbits) [<img src="https://img.shields.io/badge/supported_by-%3E__OpenSats-f97316">](https://opensats.org)
-<img width="2000" height="203" alt="lnbits_head" src="https://github.com/user-attachments/assets/77669718-ac10-43c7-ae95-6ce236c77401" />
+![phase: stable](https://img.shields.io/badge/phase-stable-2EA043) [![license-badge]](LICENSE) [![docs-badge]][docs] ![PRs: welcome](https://img.shields.io/badge/PRs-Welcome-yellow) [![explore: LNbits extensions](https://img.shields.io/badge/explore-LNbits%20extensions-10B981)](https://extensions.lnbits.com/) [![hardware: LNBitsShop](https://img.shields.io/badge/hardware-LNBitsShop-7C3AED)](https://shop.lnbits.com/) [<img src="https://img.shields.io/badge/community_chat-Telegram-24A1DE">](https://t.me/lnbits) [<img src="https://img.shields.io/badge/supported_by-%3E__OpenSats-f97316">](https://opensats.org)  
+<img width="2000" height="203" alt="lnbits_head" src="https://github.com/user-attachments/assets/77669718-ac10-43c7-ae95-6ce236c77401" />  
+[![tip-hero](https://img.shields.io/badge/TipJar-LNBits%20Hero-9b5cff?labelColor=6b7280&logo=lightning&logoColor=white)](https://demo.lnbits.com/tipjar/DwaUiE4kBX6mUW6pj3X5Kg)

 # LNbits — The most powerful Bitcoin & Lightning toolkit

@@ -77,13 +78,11 @@ As well as working great in a browser, LNbits has native IoS and Android apps as

 LNbits empowers everyone with modular, open-source tools for building Bitcoin-based systems — fast, free, and extendable.

-If you like this project [send some tip love](https://demo.lnbits.com/tipjar/DwaUiE4kBX6mUW6pj3X5Kg) or visit our [Shop](https://shop.lnbits.de)
-
 [![LNbits Shop](https://demo.lnbits.com/static/images/bitcoin-shop-banner.png)](https://shop.lnbits.com/)  
 [![Visit LNbits Shop](https://img.shields.io/badge/Visit-LNbits%20Shop-7C3AED?logo=shopping-cart&logoColor=white&labelColor=5B21B6)](https://shop.lnbits.com/)
 [![Try myLNbits SaaS](https://img.shields.io/badge/Try-myLNbits%20SaaS-2563EB?logo=lightning&logoColor=white&labelColor=1E40AF)](https://my.lnbits.com/login)
 [![Read LNbits News](https://img.shields.io/badge/Read-LNbits%20News-F97316?logo=rss&logoColor=white&labelColor=C2410C)](https://news.lnbits.com/)
-[![Explore LNbits Extensions](https://img.shields.io/badge/Explore-LNbits%20Extensions-10B981?logo=puzzle-piece&logoColor=white&labelColor=065F46)](https://extensions.lnbits.com/)
+[![Explore LNbits Extensions](https://img.shields.io/badge/Explore-LNbits%20Extensions-10B981?logo=puzzle-piece&logoColor=white&labelColor=065F46)](https://extensions.lnbits.com/) [![tip-hero](https://img.shields.io/badge/TipJar-LNBits%20Hero-9b5cff?labelColor=7c3aed&logo=lightning&logoColor=white)](https://demo.lnbits.com/tipjar/DwaUiE4kBX6mUW6pj3X5Kg)

 [docs]: https://github.com/lnbits/lnbits/wiki
 [docs-badge]: https://img.shields.io/badge/docs-lnbits.org-673ab7.svg
@@ -1,6 +1,7 @@
-FROM boltz/boltz-client:latest AS boltz
+ARG LNBITS_TAG=latest

-FROM lnbits/lnbits:latest
+FROM boltz/boltz-client:latest AS boltz
+FROM lnbits/lnbits:${LNBITS_TAG}

 COPY --from=boltz /bin/boltzd /bin/boltzcli /usr/local/bin/
 RUN ls -l /usr/local/bin/boltzd
@@ -13,11 +14,13 @@ ENV PATH="/root/.local/bin:$PATH"
 # Reinstall dependencies just in case (needed for CMD usage)
 RUN uv sync --all-extras

-# LNbits + boltzd configuration
+# LNbits
 ENV LNBITS_PORT="5000"
 ENV LNBITS_HOST="0.0.0.0"
 ENV LNBITS_BACKEND_WALLET_CLASS="BoltzWallet"
 ENV FUNDING_SOURCE_MAX_RETRIES=10
+
+# Boltzd
 ENV BOLTZ_CLIENT_ENDPOINT="127.0.0.1:9002"
 ENV BOLTZ_CLIENT_MACAROON="/root/.boltz/macaroons/admin.macaroon"
 ENV BOLTZ_CLIENT_CERT="/root/.boltz/tls.cert"
@@ -25,8 +28,7 @@ ENV BOLTZ_CLIENT_WALLET="lnbits"

 EXPOSE 5000

-# Entrypoint to start boltzd and LNbits
-COPY dockerboltz.sh /dockerboltz.sh
-RUN chmod +x /dockerboltz.sh
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh

-CMD ["/dockerboltz.sh"]
+CMD ["/entrypoint.sh"]
@@ -0,0 +1,18 @@
+!data
+data/*
+
+!data/boltz
+data/boltz/*
+!data/boltz/boltz.conf
+
+!data/boltz-client
+data/boltz-client/*
+!data/boltz-client/boltz.toml
+
+!data/boltz-nginx
+data/boltz-nginx/*
+!data/boltz-nginx/default.conf
+
+!data/eclair
+data/eclair/*
+!data/eclair/eclair.conf
@@ -0,0 +1,99 @@
+![TESTS](https://github.com/lnbits/legend-regtest-enviroment/actions/workflows/ci.yml/badge.svg)
+
+# nodes
+
+- lnd-1: for locally testing your current lnbits
+- lnd-2: used for boltz backend
+- lnd-3: used for lnbits inside docker
+- cln-1: for locally testing your current lnbits
+- cln-2: used for clightning-REST
+- eclair-1: for locally testing your current lnbits
+
+# Installing regtest
+
+get the regtest enviroment ready
+
+```sh
+# Install docker https://docs.docker.com/engine/install/
+# Make sure your user has permission to use docker 'sudo usermod -aG docker ${USER}' then reboot
+# Stop/start docker 'sudo systemctl stop docker' 'sudo systemctl start docker'
+
+sudo apt install jq
+git clone https://github.com/lnbits/lnbits.git
+cd lnbits
+docker build -t lnbits/lnbits .
+mkdir docker
+git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
+cd docker
+chmod +x ./start-regtest
+./start-regtest # start the regtest and also run tests
+sudo chown -R $USER ./data # Give the data file permissions for user
+```
+
+# Running LNbits on regtest
+
+add this ENV variables to your `.env` file
+
+```sh
+DEBUG=true
+
+# LND
+LNBITS_BACKEND_WALLET_CLASS="LndRestWallet"
+LND_REST_ENDPOINT=https://127.0.0.1:8081/
+LND_REST_CERT=/home/user/repos/lnbits/docker/data/lnd-1/tls.cert
+LND_REST_MACAROON=/home/user/repos/lnbits/docker/data/lnd-1/data/chain/bitcoin/regtest/admin.macaroon
+
+# CLN
+LNBITS_BACKEND_WALLET_CLASS="CoreLightningWallet"
+CORELIGHTNING_RPC=./docker/data/clightning-1/regtest/lightning-rpc
+
+
+# Run LNbits
+uv run lnbits
+
+# Run LNbits with hot reload
+make dev
+```
+
+# testing
+
+```sh
+chmod +x ./start-regtest
+./start-regtest
+# short answer :)
+./start-regtest && echo "PASSED" || echo "FAILED" > /dev/null
+```
+
+usage of the `bitcoin-cli-sim`, `lightning-cli-sim` and `lncli-sim` aliases
+
+```sh
+cd ~/lnbits/docker
+source docker-scripts.sh
+# use bitcoin core, mine a block
+bitcoin-cli-sim -generate 1
+
+# use c-lightning nodes
+lightning-cli-sim 1 newaddr | jq -r '.bech32' # use node 1
+lightning-cli-sim 2 getinfo # use node 2
+lightning-cli-sim 3 getinfo # use node 3
+
+# use lnd nodes
+lncli-sim 1 newaddr p2wsh
+lncli-sim 2 listpeers
+```
+
+# urls
+
+- mempool: http://localhost:8080/
+- boltz api: http://localhost:9001/
+- lnd-1 rest: http://localhost:8081/
+- lnbits: http://localhost:5001/
+
+# debugging docker logs
+
+```sh
+docker logs lnbits-lnbits-1 -f
+docker logs lnbits-boltz-1 -f
+docker logs lnbits-clightning-1-1 -f
+docker logs lnbits-lnd-2-1 -f
+```
@@ -0,0 +1,49 @@
+standalone = true
+network = "regtest"
+
+# Path the the log file
+logfile = ""
+
+electrumUrl = "electrs:19001"
+electrumLiquidUrl = "electrs-liquid:19002"
+
+[BOLTZ]
+# By default the daemon automatically connects to the official Boltz instance for the network LND is on
+# This value is used to override that
+url = "http://boltz-nginx:9001"
+
+[DATABASE]
+# Path to the SQLite database file
+# path = "/home/michael/test.db"
+
+[RPC]
+# Host of
+host = "0.0.0.0"
+
+# Port of the gRPC interface
+port = 9002
+
+# Whether the REST proxy for the gRPC interface should be disabled
+restDisabled = false
+
+# Host of the REST proxy
+restHost = "0.0.0.0"
+
+# Port of the REST proxy
+restPort = 9003
+
+# Path to the TLS cert for the gRPC and REST interface
+tlsCert = ""
+
+# Path to the TLS private key for the gRPC and REST interface
+tlsKey = ""
+noTls = true
+
+# Whether the macaroon authentication for the gRPC and REST interface should be disabled
+noMacaroons = true
+
+# Path to the admin macaroon for the gRPC and REST interface
+adminMacaroonPath = ""
+
+# Path to the read only macaroon for the gRPC and REST interface
+readOnlyMacaroonPath = ""
@@ -0,0 +1,49 @@
+upstream boltz {
+    server boltz:9001;
+}
+
+upstream boltzr {
+    server boltz:9005;
+}
+
+upstream ws {
+    server boltz:9004;
+}
+
+server {
+    listen 9001;
+    listen [::]:9001;
+    server_name localhost;
+
+    add_header Access-Control-Allow-Origin "*" always;
+    add_header Access-Control-Allow-Methods 'GET, PATCH, DELETE, POST, OPTIONS' always;
+    add_header Access-Control-Allow-Headers "*" always;
+
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+
+    if ($request_method = OPTIONS) {
+        return 204;
+    }
+
+    location /v2/ws {
+        proxy_pass http://ws/;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+    }
+
+    location ~ ^/v2/(lightning|swap/rescue|swap/restore) {
+        proxy_pass http://boltzr;
+    }
+
+    location /streamswapstatus {
+        proxy_pass http://boltzr;
+    }
+
+    location / {
+        proxy_pass http://boltz;
+    }
+}
@@ -0,0 +1,111 @@
+[api]
+host = "0.0.0.0"
+port = 9_001
+
+[grpc]
+host = "0.0.0.0"
+port = 9_000
+
+[postgres]
+host = "boltz-postgres"
+port = 5432
+database = "boltz"
+username = "boltz"
+password = "boltz"
+
+[sidecar]
+  [sidecar.grpc]
+  host = "127.0.0.1"
+  port = 9003
+
+  [sidecar.ws]
+  host = "0.0.0.0"
+  port = 9004
+
+  [sidecar.api]
+  host = "0.0.0.0"
+  port = 9005
+
+[[pairs]]
+isLegacy = true
+base = "BTC"
+quote = "BTC"
+rate = 1
+fee = 0.5
+swapInFee = 0.1
+maxSwapAmount = 40_294_967
+minSwapAmount = 50_000
+
+  [pairs.timeoutDelta]
+  chain = 1440
+  reverse = 1440
+  swapMinimal = 1440
+  swapMaximal = 2880
+  swapTaproot = 10080
+
+[[pairs]]
+isLegacy = true
+base = "L-BTC"
+quote = "BTC"
+fee = 0.25
+swapInFee = 0.1
+rate = 1
+maxSwapAmount = 40_294_967
+minSwapAmount = 100
+
+  [pairs.submarineSwap]
+  minSwapAmount = 1_000
+  minBatchedAmount = 21
+
+  [pairs.chainSwap]
+  minSwapAmount = 25_000
+
+  [pairs.timeoutDelta]
+  chain = 1440
+  reverse = 1440
+  swapMinimal = 1440
+  swapMaximal = 2880
+  swapTaproot = 10080
+
+[[currencies]]
+symbol = "BTC"
+network = "bitcoinRegtest"
+minWalletBalance = 10_000_000
+minChannelBalance = 10_000_000
+maxSwapAmount = 40_294_967
+minSwapAmount = 10_000
+maxZeroConfAmount = 0
+
+  [currencies.chain]
+  # mempoolSpace = "http://mempool-web:8090/api"
+  host = "bitcoind"
+  zmqpubrawtx = "tcp://bitcoind:29000"
+  zmqpubrawblock = "tcp://bitcoind:29001"
+  port = 18_443
+  cookie = "/root/.bitcoin/regtest/.cookie"
+
+  wallet = "lnbits"
+
+  [currencies.lnd]
+  host = "lnd-2"
+  port = 10_009
+  certpath = "/data/lnd/tls.cert"
+  macaroonpath = "/data/lnd/data/chain/bitcoin/regtest/admin.macaroon"
+
+
+[liquid]
+symbol = "L-BTC"
+network = "liquidRegtest"
+
+maxSwapAmount = 40_294_967
+minSwapAmount = 10_000
+maxZeroConfAmount = 40_294_967
+
+  [liquid.chain]
+  host = "elementsd"
+  port = 18884
+  cookie = "/root/.elements/liquidregtest/.cookie"
+  zmqpubrawtx = "tcp://elementsd:31000"
+  zmqpubhashblock = "tcp://elementsd:31002"
+
+  wallet = "lnbits"
@@ -0,0 +1,28 @@
+eclair {
+  chain = "regtest"
+
+  api {
+    binding-ip = "0.0.0.0"
+    enabled = true
+    port = 8080
+    password = "lnbits"
+  }
+
+  bitcoind {
+    host = "bitcoind"
+    rpcport = 18443
+    auth = "safecookie"
+    cookie = "/root/.bitcoin/regtest/.cookie"
+
+    zmqblock = "tcp://bitcoind:29002"
+    zmqtx = "tcp://bitcoind:29000"
+  }
+
+  channel {
+    max-funding-satoshis = 10000000000
+  }
+
+  features {
+    option_support_large_channel = mandatory
+  }
+}
@@ -0,0 +1,434 @@
+services:
+
+  lnbits:
+    hostname: lnbits
+    depends_on:
+      - lnd-3
+    image: lnbits/lnbits
+    restart: on-failure
+    user: "0:0"
+    environment:
+      LNBITS_PORT: 5001
+      DEBUG: true
+      LNBITS_ADMIN_UI: false
+      LNBITS_BACKEND_WALLET_CLASS: "LndRestWallet"
+      LNBITS_DATA_FOLDER: "./data"
+      LND_REST_ENDPOINT: "https://lnd-3:8081/"
+      LND_REST_CERT: "./lnd/tls.cert"
+      LND_REST_MACAROON: "./lnd/data/chain/bitcoin/regtest/admin.macaroon"
+    ports:
+      - 5001:5001
+    volumes:
+      - lnbits-data:/app/data
+      - ./data/lnd-3:/app/lnd:uid=1000,gid=1000
+
+  boltz:
+    hostname: boltz
+    depends_on:
+      - lnd-2
+      - boltz-postgres
+    restart: always
+    image: boltz/boltz:latest
+    ports:
+      - 9000:9000
+    entrypoint: "sh -c 'sleep 30; /boltz-backend/bin/boltzd'"
+    volumes:
+      - ./data/lnd-2:/data/lnd/
+      - ./data/boltz/:/root/.boltz/
+      - elements-data:/root/.elements
+      - bitcoin-data:/root/.bitcoin
+
+  boltz-client:
+    hostname: boltz-client
+    depends_on:
+      - boltz
+    restart: always
+    image: boltz/boltz-client:latest
+    ports:
+      - 9002:9002
+      - 9003:9003
+    expose:
+      - 9002
+    healthcheck:
+      test: ['CMD', 'boltzcli', '--host', 'boltz-client', 'getinfo']
+      interval: 5s
+      timeout: 3s
+      retries: 10
+      start_period: 0s
+    volumes:
+      - elements-data:/root/.elements
+      - ./data/boltz-client:/root/.boltz
+
+  boltz-backend-nginx:
+    hostname: boltz-nginx
+    restart: always
+    image: nginx:latest
+    ports:
+      - 9001:9001
+    volumes:
+      - nginx-data:/etc/nginx/conf.d
+    healthcheck:
+      test: ['CMD-SHELL', 'curl http://localhost:9001/version']
+      timeout: 1s
+      retries: 10
+      interval: 1s
+      start_period: 0s
+
+  boltz-postgres:
+    hostname: boltz-postgres
+    restart: always
+    image: postgres:14-alpine
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready --dbname boltz --username boltz"]
+      interval: 5s
+      timeout: 30s
+      retries: 10
+      start_period: 5s
+    environment:
+      - POSTGRES_DB=boltz
+      - POSTGRES_USER=boltz
+      - POSTGRES_PASSWORD=boltz
+    expose:
+      - 5432
+
+  bitcoind:
+    hostname: bitcoind
+    image: boltz/bitcoin-core:25.0
+    command:
+      - -regtest
+      - -fallbackfee=0.00000253
+      - -zmqpubrawtx=tcp://0.0.0.0:29000
+      - -zmqpubrawblock=tcp://0.0.0.0:29001
+      - -zmqpubhashblock=tcp://0.0.0.0:29002
+      - -txindex
+      - -rpcallowip=0.0.0.0/0
+      - -rpcbind=0.0.0.0
+      - -addresstype=bech32
+      - -changetype=bech32
+      - -dbcache=2048
+      - -rpcworkqueue=256
+    volumes:
+      - bitcoin-data:/root/.bitcoin
+    expose:
+      - 29000
+      - 29001
+      - 29002
+      - 18443
+      - 18444
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "bitcoin-cli",
+          "--rpccookiefile=/root/.bitcoin/regtest/.cookie",
+          "-regtest",
+          "getblockchaininfo",
+        ]
+      timeout: 1s
+      retries: 1
+      interval: 1s
+      start_period: 0s
+
+  clightning-1:
+    hostname: clightning-1
+    depends_on:
+      - bitcoind
+    image: boltz/c-lightning:24.11
+    command:
+      - --large-channels
+      - --network=regtest
+      - --grpc-port=9736
+      - --bind-addr=0.0.0.0:9735
+      - --bitcoin-rpcconnect=bitcoind
+      - --bitcoin-rpcport=18443
+      - --clnrest-host=0.0.0.0
+      - --clnrest-port=3010
+    expose:
+      - 9735
+    ports:
+      - 9736:9736
+      - 3010:3010
+    volumes:
+      - ./data/clightning-1:/root/.lightning/
+      - bitcoin-data:/root/.bitcoin
+
+  clightning-2:
+    hostname: clightning-2
+    depends_on:
+      - bitcoind
+    image: boltz/c-lightning:22.11.1
+    command:
+      - --large-channels
+      - --network=regtest
+      - --grpc-port=9737
+      - --bind-addr=0.0.0.0:9735
+      - --bitcoin-rpcconnect=bitcoind
+      - --bitcoin-rpcport=18443
+    expose:
+      - 9735
+    ports:
+      - 9737:9737
+    volumes:
+      - ./data/clightning-2:/root/.lightning/
+      - bitcoin-data:/root/.bitcoin
+
+  clightning-2-rest:
+    hostname: clightning-2-rest
+    depends_on:
+      - clightning-2
+    image: saubyk/c-lightning-rest:0.10.7
+    entrypoint: "sh -c 'sleep 35 && /sbin/tini -g -- ./docker-entrypoint.sh'"
+    ports:
+      - 3001:3001
+    expose:
+      - 3001
+    volumes:
+      - ./data/clightning-2:/root/.lightning/:uid=1000,gid=1000
+      - ./data/clightning-2-rest:/usr/src/app/certs/
+      - bitcoin-data:/root/.bitcoin
+
+  clightning-3:
+    hostname: clightning-3
+    depends_on:
+      - bitcoind
+    image: boltz/c-lightning:24.11
+    command:
+      - --large-channels
+      - --network=regtest
+      - --grpc-port=9738
+      - --bind-addr=0.0.0.0:9735
+      - --bitcoin-rpcconnect=bitcoind
+      - --bitcoin-rpcport=18443
+    expose:
+      - 9735
+    ports:
+      - 9738:9738
+    volumes:
+      - ./data/clightning-3:/root/.lightning/
+      - bitcoin-data:/root/.bitcoin
+
+  lnd-1:
+    hostname: lnd-1
+    depends_on:
+      - bitcoind
+    image: boltz/lnd:0.18.4-beta
+    restart: on-failure
+    command:
+      - --listen=lnd-1:9735
+      - --rpclisten=lnd-1:10009
+      - --restlisten=lnd-1:8081
+      - --bitcoin.active
+      - --bitcoin.regtest
+      - --bitcoin.node=bitcoind
+      - --bitcoind.rpchost=bitcoind
+      - --bitcoind.rpccookie=/root/.bitcoin/regtest/.cookie
+      - --bitcoind.zmqpubrawtx=bitcoind:29000
+      - --bitcoind.zmqpubrawblock=bitcoind:29001
+      - --noseedbackup
+      - --protocol.wumbo-channels
+    expose:
+      - 8081
+      - 9735
+      - 10009
+    volumes:
+      - ./data/lnd-1:/root/.lnd/
+      - bitcoin-data:/root/.bitcoin
+
+  lnd-2:
+    hostname: lnd-2
+    depends_on:
+      - bitcoind
+    image: boltz/lnd:0.19.3-beta
+    restart: on-failure
+    command:
+      - --listen=lnd-2:9735
+      - --rpclisten=lnd-2:10009
+      - --restlisten=lnd-2:8081
+      - --bitcoin.active
+      - --bitcoin.regtest
+      - --bitcoin.node=bitcoind
+      - --bitcoind.rpchost=bitcoind
+      - --bitcoind.rpccookie=/root/.bitcoin/regtest/.cookie
+      - --bitcoind.zmqpubrawtx=bitcoind:29000
+      - --bitcoind.zmqpubrawblock=bitcoind:29001
+      - --noseedbackup
+      - --protocol.wumbo-channels
+    expose:
+      - 8081
+      - 9735
+      - 10009
+    volumes:
+      - ./data/lnd-2:/root/.lnd/
+      - bitcoin-data:/root/.bitcoin
+
+  lnd-3:
+    hostname: lnd-3
+    depends_on:
+      - bitcoind
+    image: boltz/lnd:0.18.4-beta
+    restart: on-failure
+    command:
+      - --listen=lnd-3:9735
+      - --rpclisten=lnd-3:10009
+      - --restlisten=lnd-3:8081
+      - --bitcoin.active
+      - --bitcoin.regtest
+      - --bitcoin.node=bitcoind
+      - --bitcoind.rpchost=bitcoind
+      - --bitcoind.rpccookie=/root/.bitcoin/regtest/.cookie
+      - --bitcoind.zmqpubrawtx=bitcoind:29000
+      - --bitcoind.zmqpubrawblock=bitcoind:29001
+      - --noseedbackup
+      - --protocol.wumbo-channels
+    ports:
+      - 8081:8081
+      - 10009:10009
+    expose:
+      - 8081
+      - 9735
+      - 10009
+    volumes:
+      - ./data/lnd-3:/root/.lnd/
+      - bitcoin-data:/root/.bitcoin
+
+  lnd-4:
+    hostname: lnd-4
+    depends_on:
+      - bitcoind
+    image: boltz/lnd:0.18.4-beta
+    restart: on-failure
+    command:
+      - --listen=lnd-4:9735
+      - --rpclisten=lnd-4:10009
+      - --restlisten=lnd-4:8081
+      - --bitcoin.active
+      - --bitcoin.regtest
+      - --bitcoin.node=bitcoind
+      - --bitcoind.rpchost=bitcoind
+      - --bitcoind.rpccookie=/root/.bitcoin/regtest/.cookie
+      - --bitcoind.zmqpubrawtx=bitcoind:29000
+      - --bitcoind.zmqpubrawblock=bitcoind:29001
+      - --noseedbackup
+      - --protocol.wumbo-channels
+    expose:
+      - 8081
+      - 9735
+      - 10009
+    volumes:
+      - ./data/lnd-4:/root/.lnd/
+      - bitcoin-data:/root/.bitcoin
+
+  eclair:
+    hostname: eclair
+    depends_on:
+      - bitcoind
+    image: boltz/eclair:0.8.0
+    restart: on-failure
+    entrypoint: "sh -c 'JAVA_OPTS=-Xmx512m /eclair-node/bin/eclair-node.sh -Declair.datadir=/root/eclair -Declair.printToConsole'"
+    ports:
+      - 8082:8080
+    expose:
+      - 9735
+      - 8080
+    volumes:
+      - ./data/eclair:/root/eclair
+      - bitcoin-data:/root/.bitcoin
+
+  electrs:
+    hostname: electrs
+    restart: always
+    image: boltz/electrs:latest
+    entrypoint: ["electrs-bitcoin"]
+    command:
+      - --electrum-rpc-addr
+      - electrs:19001
+      - --http-addr
+      - electrs:3002
+      - --daemon-rpc-addr
+      - bitcoind:18443
+      - --network
+      - regtest
+      - --jsonrpc-import
+    healthcheck:
+      test: ["CMD-SHELL", "curl -s $(hostname):3002/blocks/tip/height"]
+      timeout: 1s
+      retries: 20
+      interval: 2s
+      start_period: 5s
+    ports:
+      - 19001:19001
+      - 3002:3002
+    volumes:
+      - bitcoin-data:/root/.bitcoin
+
+  elementsd:
+    hostname: elementsd
+    restart: always
+    image: boltz/elements:latest
+    expose:
+      - 31001
+    ports:
+      - 31000:31000
+      - 31002:31002
+      - 18884:18884
+    command:
+    - -chain=liquidregtest
+    - -txindex=1
+    - -rest=1
+    - -server=1
+    - -rpcallowip=0.0.0.0/0
+    - -validatepegin=0
+    - -initialfreecoins=2100000000000000
+    - -fallbackfee=0.000001
+    - -rpcbind=0.0.0.0
+    - -rpcport=18884
+    - -zmqpubrawtx=tcp://0.0.0.0:31000
+    - -zmqpubrawblock=tcp://0.0.0.0:31001
+    - -zmqpubhashblock=tcp://0.0.0.0:31002
+    - -acceptdiscountct=1
+    - -creatediscountct=1
+    volumes:
+      - elements-data:/root/.elements
+
+  electrs-liquid:
+    hostname: electrs-liquid
+    restart: always
+    image: boltz/electrs:latest
+    entrypoint: ["electrs-liquid"]
+    command:
+      - --electrum-rpc-addr
+      - electrs-liquid:19002
+      - --http-addr
+      - electrs-liquid:3003
+      - --daemon-rpc-addr
+      - elementsd:18884
+      - --daemon-dir
+      - /root/.elements
+      - --network
+      - liquidregtest
+      - --parent-network
+      - regtest
+      - --jsonrpc-import
+    healthcheck:
+      test: ["CMD-SHELL", "curl -s $(hostname):3003/blocks/tip/height"]
+      timeout: 15s
+      retries: 20
+      interval: 2s
+      start_period: 5s
+    ports:
+      - 19002:19002
+      - 3003:3003
+    volumes:
+      - elements-data:/root/.elements
+
+volumes:
+  lnbits-data:
+  bitcoin-data:
+  elements-data:
+  nginx-data:
+    name: nginx-data
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: ./data/boltz-nginx/
@@ -0,0 +1,322 @@
+#!/bin/sh
+export COMPOSE_PROJECT_NAME=lnbits
+
+boltzcli-sim() {
+  docker exec -it lnbits-boltz-client-1 boltzcli "$@"
+}
+
+bitcoin-cli-sim() {
+  docker exec lnbits-bitcoind-1 bitcoin-cli -regtest "$@"
+}
+
+elements-cli-sim() {
+  docker exec lnbits-elementsd-1 elements-cli -rpcport=18884 -chain=liquidregtest "$@"
+}
+
+# args(i, cmd)
+lightning-cli-sim() {
+  i=$1
+  shift # shift first argument so we can use $@
+  docker exec lnbits-clightning-$i-1 lightning-cli --network regtest "$@"
+}
+
+# args(i, cmd)
+lncli-sim() {
+  i=$1
+  shift # shift first argument so we can use $@
+  docker exec lnbits-lnd-$i-1 lncli --network regtest --rpcserver=lnd-$i:10009 "$@"
+}
+
+get-eclair-pubkey() {
+  while true; do
+    pubkey=$(docker exec lnbits-eclair-1 curl http://localhost:8080/getinfo -X POST -s -u :lnbits | jq -r .nodeId 2> /dev/null)
+    pubkeyPrefix=$(echo $pubkey | cut -c1,2)
+    if [[ "$pubkeyPrefix" == "02" || "$pubkeyPrefix" == "03" ]]; then
+      echo $pubkey
+      break
+    fi
+    sleep 1
+  done
+}
+
+wait-for-eclair-channel() {
+  while true; do
+    state=$(docker exec lnbits-eclair-1 curl http://localhost:8080/channels -X POST -s -u :lnbits | jq -r ".[0].state")
+    pending=$(docker exec lnbits-eclair-1 curl -s http://localhost:8080/channels -X POST -u :lnbits| jq '. | length')
+    echo "eclair-1 pendingchannels: $pending, current state: $state"
+    if [[ "$state" == "NORMAL" ]]; then
+      break
+    fi
+    sleep 1
+  done
+}
+
+# args(i)
+fund_boltz_client() {
+  # first address of seed: abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about
+  address="el1qq2xvpcvfup5j8zscjq05u2wxxjcyewk7979f3mmz5l7uw5pqmx6xf5xy50hsn6vhkm5euwt72x878eq6zxx2z0z676mna6kdq"
+  echo "funding: $address on boltz-client"
+  elements-cli-sim -named sendtoaddress address=$address amount=30 fee_rate=100 > /dev/null
+}
+
+
+# args(i)
+fund_clightning_node() {
+  address=$(lightning-cli-sim $1 newaddr | jq -r .bech32)
+  echo "funding: $address on clightning-node: $1"
+  bitcoin-cli-sim -named sendtoaddress address=$address amount=30 fee_rate=100 > /dev/null
+}
+
+# args(i)
+fund_lnd_node() {
+  address=$(lncli-sim $1 newaddress p2wkh | jq -r .address)
+  echo "funding: $address on lnd-node: $1"
+  bitcoin-cli-sim -named sendtoaddress address=$address amount=30 fee_rate=100 > /dev/null
+}
+
+# args(i, j)
+connect_clightning_node() {
+  pubkey=$(lightning-cli-sim $2 getinfo | jq -r '.id')
+  lightning-cli-sim $1 connect $pubkey@lnbits-clightning-$2-1:9735 | jq -r '.id'
+}
+
+lnbits-regtest-start(){
+  if ! command -v jq &> /dev/null
+  then
+      echo "jq is not installed"
+      exit
+  fi
+  if ! command -v docker &> /dev/null
+  then
+      echo "docker is not installed"
+      exit
+  fi
+  if ! command -v docker version &> /dev/null
+  then
+      echo "dockerd is not running"
+      exit
+  fi
+  lnbits-regtest-stop
+  docker compose up -d --remove-orphans
+  lnbits-regtest-init
+}
+
+lnbits-regtest-start-log(){
+  lnbits-regtest-stop
+  docker compose up --remove-orphans
+  lnbits-regtest-init
+}
+
+lnbits-regtest-stop(){
+  docker compose down --volumes
+  # clean up lightning node data
+  sudo rm -rf ./data/clightning-1 ./data/clightning-2 ./data/clightning-3 ./data/lnd-1  ./data/lnd-2 ./data/lnd-3 ./data/lnd-4 ./data/boltz/boltz.db ./data/eclair/regtest ./data/boltz-client/liquid-wallet ./data/boltz-client/bitcoin-wallet ./data/boltz-client/wallet ./data/boltz-client/boltz.db
+  # recreate lightning node data folders preventing permission errors
+  mkdir ./data/clightning-1 ./data/clightning-2 ./data/clightning-3 ./data/lnd-1 ./data/lnd-2 ./data/lnd-3 ./data/lnd-4
+}
+
+lnbits-regtest-restart(){
+  lnbits-regtest-stop
+  lnbits-regtest-start
+}
+
+boltz-client-init(){
+  for i in 0 1 2; do
+    fund_boltz_client
+  done
+  elements-cli-sim -generate 3 > /dev/null
+}
+
+lnbits-bitcoin-init(){
+  echo "init_bitcoin_wallet..."
+  bitcoin-cli-sim createwallet lnbits || bitcoin-cli-sim loadwallet lnbits
+  echo "mining 150 blocks..."
+  bitcoin-cli-sim -generate 150 > /dev/null
+}
+
+lnbits-elements-init(){
+  echo "init_elements_wallet..."
+  elements-cli-sim createwallet lnbits || elements-cli-sim loadwallet lnbits
+  echo "mining 150 blocks..."
+  elements-cli-sim -generate 150 > /dev/null
+  elements-cli-sim rescanblockchain
+}
+
+lnbits-init(){
+  echo "init_lnbits..."
+  docker exec lnbits-lnbits-1 uv run python tools/create_fake_admin.py
+}
+
+lnbits-regtest-init(){
+  lnbits-bitcoin-init
+  lnbits-elements-init
+  lnbits-lightning-sync
+  lnbits-lightning-init
+  boltz-client-init
+  lnbits-init
+}
+
+lnbits-lightning-sync(){
+  wait-for-clightning-sync 1
+  wait-for-clightning-sync 2
+  wait-for-clightning-sync 3
+  wait-for-lnd-sync 1
+  wait-for-lnd-sync 2
+  wait-for-lnd-sync 3
+  wait-for-lnd-sync 4
+}
+
+lnbits-lightning-init(){
+
+  # create 10 UTXOs for each node
+  for i in 0 1 2; do
+    fund_clightning_node 1
+    fund_clightning_node 2
+    fund_clightning_node 3
+    fund_lnd_node 1
+    fund_lnd_node 2
+    fund_lnd_node 3
+    fund_lnd_node 4
+  done
+
+  echo "mining 3 blocks..."
+  bitcoin-cli-sim -generate 3 > /dev/null
+
+  lnbits-lightning-sync
+
+  channel_confirms=6
+  channel_size=24000000 # 0.024 btc
+  balance_size=12000000 # 0.12 btc
+  balance_size_msat=12000000000 # 0.12 btc
+
+  # lnd-1 -> lnd-2
+  lncli-sim 1 connect $(lncli-sim 2 getinfo | jq -r '.identity_pubkey')@lnbits-lnd-2-1 > /dev/null
+  echo "open channel from lnd-1 to lnd-2"
+  lncli-sim 1 openchannel $(lncli-sim 2 getinfo | jq -r '.identity_pubkey') $channel_size $balance_size > /dev/null
+  bitcoin-cli-sim -generate $channel_confirms > /dev/null
+  wait-for-lnd-channel 1
+
+  # lnd-1 -> lnd-3
+  lncli-sim 1 connect $(lncli-sim 3 getinfo | jq -r '.identity_pubkey')@lnbits-lnd-3-1 > /dev/null
+  echo "open channel from lnd-1 to lnd-3"
+  lncli-sim 1 openchannel $(lncli-sim 3 getinfo | jq -r '.identity_pubkey') $channel_size $balance_size > /dev/null
+  bitcoin-cli-sim -generate $channel_confirms > /dev/null
+  wait-for-lnd-channel 1
+
+  # lnd-1 -> cln-1
+  lncli-sim 1 connect $(lightning-cli-sim 1 getinfo | jq -r '.id')@lnbits-clightning-1-1 > /dev/null
+  echo "open channel from lnd-1 to cln-1"
+  lncli-sim 1 openchannel $(lightning-cli-sim 1 getinfo | jq -r '.id') $channel_size $balance_size > /dev/null
+  bitcoin-cli-sim -generate $channel_confirms > /dev/null
+  wait-for-lnd-channel 1
+
+  # lnd-1 -> cln-2
+  lncli-sim 1 connect $(lightning-cli-sim 2 getinfo | jq -r '.id')@lnbits-clightning-2-1 > /dev/null
+  echo "open channel from lnd-1 to cln-2"
+  lncli-sim 1 openchannel $(lightning-cli-sim 2 getinfo | jq -r '.id') $channel_size $balance_size > /dev/null
+  bitcoin-cli-sim -generate $channel_confirms > /dev/null
+  wait-for-lnd-channel 1
+
+  # lnd-1 -> cln-3
+  lncli-sim 1 connect $(lightning-cli-sim 3 getinfo | jq -r '.id')@lnbits-clightning-3-1 > /dev/null
+  echo "open channel from lnd-1 to cln-3"
+  lncli-sim 1 openchannel $(lightning-cli-sim 3 getinfo | jq -r '.id') $channel_size $balance_size > /dev/null
+  bitcoin-cli-sim -generate $channel_confirms > /dev/null
+  wait-for-lnd-channel 1
+
+  # lnd-2 -> cln-2
+  lncli-sim 2 connect $(lightning-cli-sim 2 getinfo | jq -r '.id')@lnbits-clightning-2-1 > /dev/null
+  echo "open channel from lnd-2 to cln-2"
+  lncli-sim 2 openchannel $(lightning-cli-sim 2 getinfo | jq -r '.id') $channel_size $balance_size > /dev/null
+  bitcoin-cli-sim -generate $channel_confirms > /dev/null
+  wait-for-lnd-channel 2
+
+  # lnd-3 -> cln-3
+  lncli-sim 3 connect $(lightning-cli-sim 3 getinfo | jq -r '.id')@lnbits-clightning-3-1 > /dev/null
+  echo "open channel from lnd-3 to cln-1"
+  lncli-sim 3 openchannel $(lightning-cli-sim 3 getinfo | jq -r '.id') $channel_size $balance_size > /dev/null
+  bitcoin-cli-sim -generate $channel_confirms > /dev/null
+  wait-for-lnd-channel 3
+
+  # lnd-3 -> cln-1
+  lncli-sim 3 connect $(lightning-cli-sim 1 getinfo | jq -r '.id')@lnbits-clightning-1-1 > /dev/null
+  echo "open channel from lnd-3 to cln-1"
+  lncli-sim 3 openchannel $(lightning-cli-sim 1 getinfo | jq -r '.id') $channel_size $balance_size > /dev/null
+  bitcoin-cli-sim -generate $channel_confirms > /dev/null
+  wait-for-lnd-channel 3
+
+  # lnd-1 -> eclair-1
+  lncli-sim 1 connect $(get-eclair-pubkey)@lnbits-eclair-1 > /dev/null
+  echo "open channel from lnd-2 to eclair-1"
+  lncli-sim 1 openchannel $(get-eclair-pubkey) $channel_size $balance_size > /dev/null
+  bitcoin-cli-sim -generate $channel_confirms > /dev/null
+  wait-for-lnd-channel 1
+
+  # lnd-2 -> eclair-1
+  lncli-sim 2 connect $(get-eclair-pubkey)@lnbits-eclair-1 > /dev/null
+  echo "open channel from lnd-2 to eclair-1"
+  lncli-sim 2 openchannel $(get-eclair-pubkey) $channel_size $balance_size > /dev/null
+  bitcoin-cli-sim -generate $channel_confirms > /dev/null
+  wait-for-lnd-channel 2
+
+  wait-for-clightning-channel 1
+  wait-for-clightning-channel 2
+  wait-for-clightning-channel 3
+
+  wait-for-eclair-channel
+
+  lnbits-lightning-sync
+
+}
+
+wait-for-lnd-channel(){
+  while true; do
+    pending=$(lncli-sim $1 pendingchannels | jq -r '.pending_open_channels | length')
+    echo "lnd-$1 pendingchannels: $pending"
+    if [[ "$pending" == "0" ]]; then
+      break
+    fi
+    sleep 1
+  done
+}
+
+wait-for-lnd-sync(){
+  while true; do
+    if [[ "$(lncli-sim $1 getinfo 2>&1 | jq -r '.synced_to_chain' 2> /dev/null)" == "true" ]]; then
+      echo "lnd-$1 is synced!"
+      break
+    fi
+    echo "waiting for lnd-$1 to sync..."
+    sleep 1
+  done
+}
+
+wait-for-clightning-channel(){
+  while true; do
+    pending=$(lightning-cli-sim $1 getinfo | jq -r '.num_pending_channels | length')
+    echo "cln-$1 pendingchannels: $pending"
+    if [[ "$pending" == "0" ]]; then
+      if [[ "$(lightning-cli-sim $1 getinfo 2>&1 | jq -r '.warning_bitcoind_sync' 2> /dev/null)" == "null" ]]; then
+        if [[ "$(lightning-cli-sim $1 getinfo 2>&1 | jq -r '.warning_lightningd_sync' 2> /dev/null)" == "null" ]]; then
+          break
+        fi
+      fi
+    fi
+    sleep 1
+  done
+}
+
+wait-for-clightning-sync(){
+  while true; do
+    if [[ ! "$(lightning-cli-sim $1 getinfo 2>&1 | jq -r '.id' 2> /dev/null)" == "null" ]]; then
+      if [[ "$(lightning-cli-sim $1 getinfo 2>&1 | jq -r '.warning_bitcoind_sync' 2> /dev/null)" == "null" ]]; then
+        if [[ "$(lightning-cli-sim $1 getinfo 2>&1 | jq -r '.warning_lightningd_sync' 2> /dev/null)" == "null" ]]; then
+          echo "cln-$1 is synced!"
+          break
+        fi
+      fi
+    fi
+    echo "waiting for cln-$1 to sync..."
+    sleep 1
+  done
+}
@@ -0,0 +1,74 @@
+#!/bin/bash
+print_success() {
+  printf "\033[;1;32mPASSED\033[;0m $1\n"
+}
+
+print_error() {
+  printf "\033[;1;31mFAILED\033[;0m $1\n"
+}
+
+run(){
+  label=$1
+  value=$2
+  cmd=$3
+  if [[ "$cmd" == "$value" ]]; then
+    print_success "$label is $cmd"
+  else
+    print_error "$label is $cmd, should be $value"
+    failed="true"
+  fi
+}
+
+failed="false"
+blockheight=213
+utxos=3
+channel_size=24000000 # 0.024 btc
+balance_size=12000000 # 0.012 btc
+
+source $(pwd)/docker-scripts.sh
+lnbits-regtest-start
+echo "=================================="
+printf "\033[;1;36mregtest started! starting tests...\033[;0m\n"
+echo "=================================="
+echo ""
+
+for i in 1 2 3; do
+  run "lnd-$i .synced_to_chain" "true" $(lncli-sim $i getinfo | jq -r ".synced_to_chain")
+  run "lnd-$i utxo count" $utxos $(lncli-sim $i listunspent | jq -r ".utxos | length")
+  run "lnd-$i .block_height" $blockheight $(lncli-sim $i getinfo | jq -r ".block_height")
+  if [[ "$i" == "1" ]]; then
+    channel_count=6
+  else
+    channel_count=3
+  fi
+  run "lnd-$i openchannels" $channel_count $(lncli-sim $i listchannels | jq -r ".channels | length")
+  run "lnd-$i .channels[0].capacity" $channel_size $(lncli-sim $i listchannels | jq -r ".channels[0].capacity")
+  run "lnd-$i .channels[0].push_amount_sat" $balance_size $(lncli-sim $i listchannels | jq -r ".channels[0].push_amount_sat")
+done
+for i in 1 2 3; do
+  # run "cln-$i blockheight" $blockheight $(lightning-cli-sim $i getinfo | jq -r ".blockheight")
+  run "cln-$i utxo count" $utxos $(lightning-cli-sim $i listfunds | jq -r ".outputs | length")
+  run "cln-$i openchannels" 2 $(lightning-cli-sim $i getinfo | jq -r ".num_active_channels")
+  run "cln-$i channel[0].state" "CHANNELD_NORMAL" $(lightning-cli-sim $i listfunds | jq -r ".channels[0].state")
+  run "cln-$i channel[0].amount_msat" $(($channel_size * 1000)) $(lightning-cli-sim $i listfunds | jq -r ".channels[0].amount_msat" | sed 's/msat//g')
+  run "cln-$i channel[0].our_amount_msat" $(($balance_size * 1000)) $(lightning-cli-sim $i listfunds | jq -r ".channels[0].our_amount_msat" | sed 's/msat//g')
+done
+
+run "eclair-1 openchannels" 2 $(docker exec lnbits-eclair-1 curl -s http://localhost:8080/channels -X POST -u :lnbits| jq '. | length')
+run "eclair-1 blockHeight" $blockheight $(docker exec lnbits-eclair-1 curl -s http://localhost:8080/getinfo -X POST -u :lnbits| jq '.blockHeight')
+run "lnbits service status" "200" $(curl -s -o /dev/null -w "%{http_code}" "http://localhost:5001/")
+run "boltz service status" "200" $(curl -s -o /dev/null --head -w "%{http_code}" "http://localhost:9001/version")
+
+# return non-zero exit code if a test fails
+if [[ "$failed" == "true" ]]; then
+  echo ""
+  echo "=================================="
+  print_error "one more more tests failed"
+  echo "=================================="
+  exit 1
+else
+  echo ""
+  echo "=================================="
+  print_success "all tests passed! yay!"
+  echo "=================================="
+fi
@@ -0,0 +1,36 @@
+ARG LNBITS_TAG=latest
+
+FROM lnbits/lnbits:${LNBITS_TAG}
+
+RUN apt-get update && apt-get -y upgrade
+RUN apt-get install -y netcat-openbsd npm nodejs git
+
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh
+ENV PATH="/root/.local/bin:$PATH"
+
+# install sparksidecar
+RUN git clone https://github.com/lnbits/spark_sidecar
+RUN cd spark_sidecar && npm install
+
+# Reinstall dependencies for lnbits just in case (needed for CMD usage)
+RUN uv sync --all-extras
+
+# LNBITS
+ENV LNBITS_PORT="5000"
+ENV LNBITS_HOST="0.0.0.0"
+ENV LNBITS_BACKEND_WALLET_CLASS="SparkL2Wallet"
+ENV FUNDING_SOURCE_MAX_RETRIES=10
+
+# spark sidecar
+ENV SPARK_MNEMONIC="bottom bottom bottom bottom bottom bottom bottom bottom bottom bottom bottom bottom"
+ENV SPARK_NETWORK="MAINNET"
+ENV SPARK_SIDECAR_PORT="8765"
+ENV SPARK_PAY_WAIT_MS="20000"
+
+EXPOSE 5000
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+# Entrypoint to start sparksidebar and LNbits
+CMD ["/entrypoint.sh"]
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+
+node spark_sidecar/server.mjs &
+
+SIDECAR_PID=$!
+
+# Wait for startup
+for i in {1..10}; do
+  if nc -z localhost $SPARK_SIDECAR_PORT; then
+    echo "sparksidebar is up!"
+    break
+  fi
+  echo "Waiting for sparksidebar to start..."
+  sleep 1
+done
+
+# Optional: check if still not up
+if ! nc -z localhost $SPARK_SIDECAR_PORT; then
+  echo "sparksidebar did not start successfully."
+  exit 1
+fi
+
+echo "Starting LNbits on $LNBITS_HOST:$LNBITS_PORT..."
+exec uv run lnbits --port "$LNBITS_PORT" --host "$LNBITS_HOST" --forwarded-allow-ips='*'
@@ -4,6 +4,7 @@ color_scheme: dark
 logo: "/logos/lnbits-full-inverse.png"
 search_enabled: true
 url: https://docs.lnbits.org
+markdown: gfm
 aux_links:
  "LNbits on GitHub":
    - "//github.com/lnbits/lnbits"
@@ -1,3 +1,9 @@
+---
+layout: default
+title: FastAPI extension upgrade
+nav_order: 1
+---
+
 ## Defining a route with path parameters

 **old:**
@@ -1,3 +1,9 @@
+---
+layout: default
+title: Admin UI
+nav_order: 1
+---
+
 <a href="https://lnbits.com" target="_blank" rel="noopener noreferrer">
  <picture>
    <source media="(prefers-color-scheme: dark)" srcset="https://i.imgur.com/QE6SIrs.png">
@@ -12,11 +18,13 @@

 # LNBits Admin UI

-We introduced the Admin UI as the new default to make setup simpler and more straightforward. Instead of hand editing the `.env` file, you configure key server settings directly in the frontend with clear labels and guardrails.
+[What you can do](#what-you-can-do-with-the-admin-ui) · [First Run](#first-run-and-super-user-id) · [Enable/Disable](#enabling-or-disabling-the-admin-ui) · [Reset](#reset-to-defaults) · [Allowed Users](#allowed-users) · [Guides](#additional-guides)
+
+**We introduced the Admin UI as the new default to make setup simpler and more straightforward**. Instead of hand editing the `.env` file, you configure key server settings directly in the frontend with clear labels and guardrails.

 <ins>On a fresh install the Admin UI is enabled by default</ins>, and at first launch you are prompted to create **Super User** credentials so that sensitive operations, such as switching funding sources, remain in trusted hands. When the Admin UI is enabled, configuration is written to and read from the database; for all settings managed by the UI, the parameters in `.env` are largely no longer used. If you disable the Admin UI, the `.env` file becomes the single source of truth again.

-For privileged actions and role details see **[Super User](./super_user.md)** & [User Roles](./user_roles.md)  
+For privileged actions and role details see **[Super User](./super_user.md)** & [User Roles](./user_roles.md)
 For a complete reference of legacy variables consult **[.env.example](../../.env.example)**.

 <img width="900" height="640" alt="grafik" src="https://github.com/user-attachments/assets/d8852b4b-21be-446f-a1e7-d3eb794d3505" />
@@ -36,6 +44,27 @@ For a complete reference of legacy variables consult **[.env.example](../../.env
 > [!NOTE]
 > See **[Super User](./super_user.md)** for the role and permission differences compared to Admin Users.

+## First run and Super User ID
+
+On first start with the Admin UI enabled you will be prompted to generate a Super User.
+
+<img width="1573" height="976" alt="Admin_UI_first_install" src="https://github.com/user-attachments/assets/05aa634f-06ec-4a4d-a5c6-d90927c90991" />
+
+If you need to read it from disk later:
+
+```bash
+cat /lnbits/data/.super_user
+# example
+123de4bfdddddbbeb48c8bc8382fe123
+```
+
+> [!WARNING]
+> For security reasons, Super Users and Admin users must authenticate with credentials (username and password).
+
+After login you will see **Settings** and **Users** in the sidebar between **Wallets** and **Extensions**, plus a role badge in the top left.
+
+<img width="1353" height="914" alt="grafik" src="https://github.com/user-attachments/assets/06bb4f36-a23a-4058-87ec-60440d322c25" />
+
 ## Enabling or disabling the Admin UI

 The Admin UI is enabled by default on new installs. To change the state:
@@ -76,23 +105,6 @@ The Admin UI is enabled by default on new installs. To change the state:

 Using `Reset to defaults` in the Admin UI wipes stored settings. After a restart, a new `Super User` is created and the old one is no longer valid.

-## First run and Super User ID
-
-On first start with the Admin UI enabled you will be prompted to generate a Super User. If you need to read it from disk later:
-
-```bash
-cat /lnbits/data/.super_user
-# example
-123de4bfdddddbbeb48c8bc8382fe123
-```
-
-> [!WARNING]
-> For security reasons, Super Users and Admin users must authenticate with credentials (username and password).
-
-After login you will see **Settings** and **Users** in the sidebar between **Wallets** and **Extensions**, plus a role badge in the top left.
-
-<img width="1353" height="914" alt="grafik" src="https://github.com/user-attachments/assets/06bb4f36-a23a-4058-87ec-60440d322c25" />
-
 ## Allowed Users

 When set **at least one**, LNbits becomes private: only the listed users and Admins can access the frontend. Account creation is disabled automatically. You can also disable account creation explicitly.
@@ -105,8 +117,8 @@ When set **at least one**, LNbits becomes private: only the listed users and Adm
 ## Additional Guides

 - **[Backend Wallets](./wallets.md)** — Explore options to fund your LNbits instance.
- **[User Roles](./User_Roles.md)** — Overview of existing roles in LNbits.
- **[Funding sources](./funding-sources_table.md)** — What is available and how to configure each.
+- **[User Roles](./user_roles.md)** — Overview of existing roles in LNbits.
+- **[Funding sources](./funding-sources-table.md)** — What is available and how to configure each.
 - **[Install LNBits](./installation.md)** — Choose your prefared way to install LNBits.

 ## Powered by LNbits
@@ -115,7 +127,7 @@ LNbits empowers everyone with modular, open source tools for building Bitcoin ba

 If you like this project, [send some tip love](https://demo.lnbits.com/tipjar/DwaUiE4kBX6mUW6pj3X5Kg) or visit our [Shop](https://shop.lnbits.de)

-[![LNbits Shop](https://demo.lnbits.com/static/images/bitcoin-shop-banner.png)](https://shop.lnbits.com/)  
+[![LNbits Shop](https://demo.lnbits.com/static/images/bitcoin-shop-banner.png)](https://shop.lnbits.com/)
 [![Visit LNbits Shop](https://img.shields.io/badge/Visit-LNbits%20Shop-7C3AED?logo=shopping-cart&logoColor=white&labelColor=5B21B6)](https://shop.lnbits.com/)
 [![Try myLNbits SaaS](https://img.shields.io/badge/Try-myLNbits%20SaaS-2563EB?logo=lightning&logoColor=white&labelColor=1E40AF)](https://my.lnbits.com/login)
 [![Read LNbits News](https://img.shields.io/badge/Read-LNbits%20News-F97316?logo=rss&logoColor=white&labelColor=C2410C)](https://news.lnbits.com/)
@@ -1,3 +1,9 @@
+---
+layout: default
+title: Extension Install
+nav_order: 1
+---
+
 # Extension Install

 Anyone can create an extension by following the [example extension](https://github.com/lnbits/example) and [making extensions](https://github.com/lnbits/lnbits/blob/main/docs/devs/extensions.md) dev guide.
@@ -1,3 +1,9 @@
+---
+layout: default
+title: Wallet comparison
+nav_order: 1
+---
+
 <a href="https://lnbits.com" target="_blank" rel="noopener noreferrer">
  <picture>
    <source media="(prefers-color-scheme: dark)" srcset="https://i.imgur.com/QE6SIrs.png">
@@ -44,6 +50,7 @@ Below is a side-by-side comparison of Lightning funding sources you can use with
 | **Blink**                      | Custodial                | ✅                  | Low                            | ❌                        | Low               | Provider-managed         | Easy              | Low                    | Transaction fees apply                       | Medium          | Third-party service; focuses on mobile integrations.                                       |
 | **ZBD**                        | Custodial                | ✅                  | Low                            | ❌                        | Low               | Provider-managed         | Easy              | Low                    | Transaction fees apply                       | Medium          | Gaming-focused payment platform.                                                           |
 | **Spark (CLN)**                | Self-custodial           | ❌                  | Higher                         | ✅                        | High              | Manual                   | Moderate          | High                   | Infrastructure cost and channel opening fees | High            | Web interface for CLN; requires Spark server setup.                                        |
+| **Spark (L2)**                 | Self-custodial           | ❌                  | Medium                         | ❌                        | Medium            | Automatic                | Easy              | Low                    | Minimal fees                                 | Medium          | Runs via Spark sidecar; seed-based self-custody.                                           |
 | **Cliche Wallet**              | Self-custodial           | ❌                  | Medium                         | ❌                        | Medium            | Manual                   | Moderate          | Moderate               | Minimal fees                                 | Medium          | Lightweight wallet; suitable for embedded systems.                                         |
 | **Strike**                     | Custodial                | ✅                  | Low                            | ❌                        | Low               | Provider-managed         | Easy              | Low                    | Transaction fees apply                       | Medium          | Third-party service; suitable for quick setups.                                            |
 | **LNPay**                      | Custodial                | ✅                  | Low                            | ❌                        | Low               | Provider-managed         | Easy              | Low                    | Transaction fees apply                       | Medium          | Third-party service; suitable for quick setups.                                            |
@@ -51,7 +58,9 @@ Below is a side-by-side comparison of Lightning funding sources you can use with
 | **LN.tips**                    | Custodial/Self-Custodial | Depends on provider | Medium                         | ❌                        | Low               | Provider-managed         | Moderate          | Low                    | Transaction fees may apply                   | Medium          | Simple hosted service; use LN.tips API as your backend.                                    |
 | **Fake Wallet**                | Testing (simulated)      | ❌                  | Low                            | ❌                        | N/A               | N/A                      | Easy              | Low                    | None (test only)                             | N/A             | For testing only; mints accounting units in LNbits (no real sats, unit name configurable). |

---
+## Spark (L2)
+
+Spark L2 uses a local Node.js sidecar to expose an HTTP API that LNbits can use as a funding source. It is self-custodial and secured by a standard mnemonic seed. You can let LNbits run the sidecar internally or run your own instance (see `https://github.com/lnbits/spark_sidecar`).

 ### Notes for readers

@@ -72,7 +81,7 @@ LNbits empowers everyone with modular, open-source tools for building Bitcoin-ba

 If you like this project, [send some tip love](https://demo.lnbits.com/tipjar/DwaUiE4kBX6mUW6pj3X5Kg) or visit our [Shop](https://shop.lnbits.de)

-[![LNbits Shop](https://demo.lnbits.com/static/images/bitcoin-shop-banner.png)](https://shop.lnbits.com/)  
+[![LNbits Shop](https://demo.lnbits.com/static/images/bitcoin-shop-banner.png)](https://shop.lnbits.com/)
 [![Visit LNbits Shop](https://img.shields.io/badge/Visit-LNbits%20Shop-7C3AED?logo=shopping-cart&logoColor=white&labelColor=5B21B6)](https://shop.lnbits.com/)
 [![Try myLNbits SaaS](https://img.shields.io/badge/Try-myLNbits%20SaaS-2563EB?logo=lightning&logoColor=white&labelColor=1E40AF)](https://my.lnbits.com/login)
 [![Read LNbits News](https://img.shields.io/badge/Read-LNbits%20News-F97316?logo=rss&logoColor=white&labelColor=C2410C)](https://news.lnbits.com/)
@@ -1,3 +1,9 @@
+---
+layout: default
+title: Installation
+nav_order: 1
+---
+
 <a href="https://lnbits.com" target="_blank" rel="noopener noreferrer">
  <picture>
    <source media="(prefers-color-scheme: dark)" srcset="https://i.imgur.com/QE6SIrs.png">
@@ -51,8 +57,8 @@ LNBITS_ADMIN_UI=true HOST=0.0.0.0 PORT=5000 ./LNbits-latest.AppImage # most syst
 - LNbits will create a folder for DB and extension files **in the same directory** as the AppImage.

 > [!NOTE]
-> **Next steps**  
-> Install complete → **[Running LNbits](#run-the-server)**  
+> **Next steps**
+> Install complete → **[Running LNbits](#run-the-server)**
 > Update LNBits → **[Update LNbits (all methods)](#update-lnbits-all-methods)**

 ## Option 2: UV (recommended for developers)
@@ -117,8 +123,8 @@ uv run lnbits
 #### Use Admin UI → Extensions → "Update All" to bring extensions up to the proper level

 > [!NOTE]
-> **Next steps**  
-> Install complete → **[Running LNbits](#run-the-server)**  
+> **Next steps**
+> Install complete → **[Running LNbits](#run-the-server)**
 > Update LNBits → **[Update LNbits (all methods)](#update-lnbits-all-methods)**

 ## Option 2a (Legacy): Poetry — _Replaced by UV_
@@ -197,8 +203,8 @@ poetry run lnbits
 #### Use Admin UI → Extensions → "Update All" to bring extensions up to the proper level

 > ![NOTE](https://img.shields.io/badge/NOTE-3b82f6?labelColor=494949)
-> **Next steps**  
-> Install complete → **[Running LNbits](#run-the-server)**  
+> **Next steps**
+> Install complete → **[Running LNbits](#run-the-server)**
 > Update LNBits → **[Update LNbits (all methods)](#update-lnbits-all-methods)**

 </details>
@@ -217,8 +223,8 @@ chmod +x lnbits.sh &&
 - You can use `./lnbits.sh` to run, but for more control: `cd lnbits` and use `uv run lnbits` (see Option 2).

 > ![NOTE](https://img.shields.io/badge/NOTE-3b82f6?labelColor=494949)
-> **Next steps**  
-> Install complete → **[Running LNbits](#run-the-server)**  
+> **Next steps**
+> Install complete → **[Running LNbits](#run-the-server)**
 > Update LNBits → **[Update LNbits (all methods)](#update-lnbits-all-methods)**

 </details>
@@ -286,7 +292,7 @@ SUPER_USER=be54db7f245346c8833eaa430e1e0405 LNBITS_ADMIN_UI=true ./result/bin/ln
 ```

 > ![NOTE](https://img.shields.io/badge/NOTE-3b82f6?labelColor=494949)
-> **Next steps**  
+> **Next steps**
 > Update LNBits → **[Update LNbits (all methods)](#update-lnbits-all-methods)**

 </details>
@@ -340,8 +346,8 @@ docker build --build-arg POETRY_INSTALL_ARGS="-E breez" -t lnbits/lnbits .
 ```

 > ![NOTE](https://img.shields.io/badge/NOTE-3b82f6?labelColor=494949)
-> **Next steps**  
-> Install complete → **[Running LNbits](#run-the-server)**  
+> **Next steps**
+> Install complete → **[Running LNbits](#run-the-server)**
 > Update LNBits → **[Update LNbits (all methods)](#update-lnbits-all-methods)**

 </details>
@@ -380,14 +386,14 @@ You'll be prompted to enter an app name, region, postgres (choose no), deploy no
 You'll now find a file in the directory called `fly.toml`. Open that file and modify/add the following settings.

 > ![IMPORTANT](https://img.shields.io/badge/IMPORTANT-7c3aed?labelColor=494949)
-> Be sure to replace `${PUT_YOUR_LNBITS_ENV_VARS_HERE}` with all relevant environment variables in `.env` or `.env.example`.  
-> Environment variable strings should be quoted here. For example, if `.env` has  
-> `LNBITS_ENDPOINT=https://demo.lnbits.com`, then in `fly.toml` use  
+> Be sure to replace `${PUT_YOUR_LNBITS_ENV_VARS_HERE}` with all relevant environment variables in `.env` or `.env.example`.
+> Environment variable strings should be quoted here. For example, if `.env` has
+> `LNBITS_ENDPOINT=https://demo.lnbits.com`, then in `fly.toml` use
 > `LNBITS_ENDPOINT="https://demo.lnbits.com"`.

 > ![WARNING](https://img.shields.io/badge/WARNING-ea580c?labelColor=494949)
-> Don't enter secret environment variables here. Fly.io offers **secrets** (via `fly secrets`) that are exposed as env vars at runtime.  
-> Example (LND REST funding source):  
+> Don't enter secret environment variables here. Fly.io offers **secrets** (via `fly secrets`) that are exposed as env vars at runtime.
+> Example (LND REST funding source):
 > `fly secrets set LND_REST_MACAROON=<hex_macaroon_data>`

 ```
@@ -445,8 +451,8 @@ poetry add setuptools wheel

 > ![NOTE](https://img.shields.io/badge/NOTE-3b82f6?labelColor=0b0b0b)
 >
-> **Next steps**  
-> Install complete → **[Running LNbits](#run-the-server)**  
+> **Next steps**
+> Install complete → **[Running LNbits](#run-the-server)**
 > Update LNbits → **[Update LNbits (all methods)](#update-lnbits-all-methods)**

 ## Troubleshooting
@@ -524,22 +530,22 @@ Visit **[http://localhost:5000/](http://localhost:5000/)** (or `0.0.0.0:5000`).
 > [!NOTE]
 > **Paths overview**
 >
-> - **SuperUser file:** `<lnbits_root>/data/.super_user`  
+> - **SuperUser file:** `<lnbits_root>/data/.super_user`
 >   Example: `~/lnbits/data/.super_user` • View: `cat ~/lnbits/data/.super_user`
 > - **Environment file:** `<lnbits_root>/.env` (for bare-metal installs)
-> - **Docker:** bind a host directory to `/app/data`.  
->   On the host the SuperUser file is at `<host_data_dir>/.super_user`.  
+> - **Docker:** bind a host directory to `/app/data`.
+>   On the host the SuperUser file is at `<host_data_dir>/.super_user`.
 >   The container reads `/app/.env` (usually bind-mounted from your project root).

 > [!TIP]
-> **Local Lightning test network**  
-> Use **Polar** to spin up a safe local Lightning environment and test LNbits without touching your live setup.  
+> **Local Lightning test network**
+> Use **Polar** to spin up a safe local Lightning environment and test LNbits without touching your live setup.
 > https://lightningpolar.com/

 > [!TIP]
-> **API comparison before updates**  
-> Use **TableTown** to diff your LNbits instance against another (dev vs prod) or the upstream dev branch. Spot endpoint changes before updating.  
-> Crafted by [Arbadacarbayk](https://github.com/arbadacarbaYK) - a standout contribution that makes pre-release reviews fast and reliable.  
+> **API comparison before updates**
+> Use **TableTown** to diff your LNbits instance against another (dev vs prod) or the upstream dev branch. Spot endpoint changes before updating.
+> Crafted by [Arbadacarbayk](https://github.com/arbadacarbaYK) - a standout contribution that makes pre-release reviews fast and reliable.
 > https://arbadacarbayk.github.io/LNbits_TableTown/

 # Additional guides
@@ -884,5 +890,5 @@ LNbits empowers everyone with modular, open-source tools for building Bitcoin-ba

 If you like this project [send some tip love](https://demo.lnbits.com/tipjar/DwaUiE4kBX6mUW6pj3X5Kg) or visiting our [Shop](https://shop.lnbits.com)

-[![LNbits Shop](https://demo.lnbits.com/static/images/bitcoin-shop-banner.png)](https://shop.lnbits.com/)  
+[![LNbits Shop](https://demo.lnbits.com/static/images/bitcoin-shop-banner.png)](https://shop.lnbits.com/)
 [![Visit LNbits Shop](https://img.shields.io/badge/Visit-LNbits%20Shop-7C3AED?logo=shopping-cart&logoColor=white&labelColor=5B21B6)](https://shop.lnbits.com/) [![Try myLNbits SaaS](https://img.shields.io/badge/Try-myLNbits%20SaaS-2563EB?logo=lightning&logoColor=white&labelColor=1E40AF)](https://my.lnbits.com/login) [![Read LNbits News](https://img.shields.io/badge/Read-LNbits%20News-F97316?logo=rss&logoColor=white&labelColor=C2410C)](https://news.lnbits.com/) [![Explore LNbits Extensions](https://img.shields.io/badge/Explore-LNbits%20Extensions-10B981?logo=puzzle-piece&logoColor=white&labelColor=065F46)](https://extensions.lnbits.com/)
@@ -1,3 +1,9 @@
+---
+layout: default
+title: Super user
+nav_order: 1
+---
+
 <a href="https://lnbits.com" target="_blank" rel="noopener noreferrer">
  <picture>
    <source media="(prefers-color-scheme: dark)" srcset="https://i.imgur.com/QE6SIrs.png">
@@ -110,8 +116,8 @@ These are practical tips for running a safe and friendly instance.
 ## Additional guides

 - **[Admin UI](./admin_ui.md)** — Manage server settings in the browser instead of editing `.env` or using the CLI for routine tasks.
- **[User Roles](./User_Roles.md)** — Overview of roles and what they can do.
- **[Funding sources](./funding-sources_table.md)** — Available options and how to enable and configure them.
+- **[User Roles](./user_roles.md)** — Overview of roles and what they can do.
+- **[Funding sources](./funding-sources-table.md)** — Available options and how to enable and configure them.
 - **[Install LNBits](./installation.md)** — Choose your prefared way to install LNBits.

 ## Powered by LNbits
@@ -1,3 +1,9 @@
+---
+layout: default
+title: User Roles
+nav_order: 1
+---
+
 <a href="https://lnbits.com" target="_blank" rel="noopener noreferrer">
  <picture>
    <source media="(prefers-color-scheme: dark)" srcset="https://i.imgur.com/QE6SIrs.png">
@@ -14,7 +20,7 @@

 ### Understand **who can do what** in seconds: `Super User`, `Admin`, and `Regular User`.

-**Jump to:**  
+**Jump to:**
 [Roles at a Glance](#roles-at-a-glance) •
 [Super User](#super-user--master-control) •
 [Admin](#admin--day-to-day-manager) •
@@ -81,7 +87,7 @@ For using LNbits, not administering it.

 - **[Admin UI](./admin_ui.md)** — Manage server settings via a clean UI (avoid editing `.env` by hand).
 - **[Super User](./super_user.md)** — Deep dive on responsibilities and safe usage patterns.
- **[Funding sources](./funding-sources_table.md)** — What’s available and how to enable/configure each.
+- **[Funding sources](./funding-sources-table.md)** — What’s available and how to enable/configure each.

 ## Powered by LNbits

@@ -89,7 +95,7 @@ LNbits empowers everyone with modular, open-source tools for building Bitcoin-ba

 If you like this project, [send some tip love](https://demo.lnbits.com/tipjar/DwaUiE4kBX6mUW6pj3X5Kg) or visit our [Shop](https://shop.lnbits.de)

-[![LNbits Shop](https://demo.lnbits.com/static/images/bitcoin-shop-banner.png)](https://shop.lnbits.com/)  
+[![LNbits Shop](https://demo.lnbits.com/static/images/bitcoin-shop-banner.png)](https://shop.lnbits.com/)
 [![Visit LNbits Shop](https://img.shields.io/badge/Visit-LNbits%20Shop-7C3AED?logo=shopping-cart&logoColor=white&labelColor=5B21B6)](https://shop.lnbits.com/)
 [![Try myLNbits SaaS](https://img.shields.io/badge/Try-myLNbits%20SaaS-2563EB?logo=lightning&logoColor=white&labelColor=1E40AF)](https://my.lnbits.com/login)
 [![Read LNbits News](https://img.shields.io/badge/Read-LNbits%20News-F97316?logo=rss&logoColor=white&labelColor=C2410C)](https://news.lnbits.com/)
@@ -41,6 +41,7 @@ A backend wallet is selected and configured entirely through LNbits environment
 | [CoreLightning](#corelightning)                 | [LND (gRPC)](#lnd-grpc)               | [Blink](#blink)                                   |
 | [CoreLightning REST](#corelightning-rest)       | [LNbits](#lnbits)                     | [Alby](#alby)                                     |
 | [Spark (Core Lightning)](#spark-core-lightning) | [LNPay](#lnpay)                       | [Boltz](#boltz)                                   |
+| [Spark (L2)](#spark-l2)                         |                                       |                                                   |
 | [Cliche Wallet](#cliche-wallet)                 | [ZBD](#zbd)                           | [Phoenixd](#phoenixd)                             |
 | [Breez SDK](#breez-sdk)                         | [Breez Liquid SDK](#breez-liquid-sdk) | [Nostr Wallet Connect](#nostr-wallet-connect-nwc) |
 | [Strike](#strike)                               | [Eclair (ACINQ)](#eclair-acinq)       | [LN.tips](#lntips)                                |
@@ -52,7 +53,7 @@ A backend wallet is selected and configured entirely through LNbits environment

 ### CLNRest (using [runes](https://docs.corelightning.org/reference/lightning-createrune))

-[Core Lightning REST API docs](https://docs.corelightning.org/docs/rest)  
+[Core Lightning REST API docs](https://docs.corelightning.org/docs/rest)
 Should also work with the [Rust version of CLNRest](https://github.com/daywalker90/clnrest-rs)

 **Environment variables**
@@ -127,6 +128,47 @@ Old REST interface using [RTL c-lightning-REST](https://github.com/Ride-The-Ligh
 - `SPARK_URL`: `http://10.147.17.230:9737/rpc`
 - `SPARK_TOKEN`: `secret_access_key`

+## Spark (L2)
+
+Spark L2 is a self-custodial funding source that uses a small Node.js sidecar to talk to the Spark network and expose an HTTP API. You can let LNbits run the sidecar internally, or run it yourself and point LNbits at it.
+
+**Required env vars**
+
+- `LNBITS_BACKEND_WALLET_CLASS`: `SparkL2Wallet`
+
+**Internal sidecar (LNbits-managed)**
+
+- `SPARK_L2_INTERNAL_SIDECAR_VERSION`: `0.1.1`
+- `SPARK_L2_MNEMONIC`: `...` (optional; auto-generated if blank)
+- `SPARK_L2_NETWORK`: `MAINNET`
+
+Optional tuning:
+
+- `SPARK_L2_PAY_WAIT_MS`: `4000`
+- `SPARK_L2_PAY_POLL_MS`: `500`
+- `SPARK_L2_STREAM_KEEPALIVE_MS`: `15000`
+
+**External sidecar**
+
+- `SPARK_L2_EXTERNAL_ENDPOINT`: `http://127.0.0.1:8765`
+- `SPARK_L2_EXTERNAL_API_KEY`: `...` (if your sidecar requires auth)
+
+Example: run the sidecar manually (external mode)
+
+```bash
+git clone https://github.com/lnbits/spark_sidecar.git
+cd spark_sidecar
+npm install
+
+SPARK_MNEMONIC="bottom bottom bottom bottom bottom bottom bottom bottom bottom bottom bottom bottom" \
+SPARK_NETWORK=MAINNET \
+SPARK_SIDECAR_PORT=8765 \
+SPARK_PAY_WAIT_MS=20000 \
+node server.mjs
+```
+
+For testing, you can generate a 12-word mnemonic at `https://iancoleman.io/bip39/`. Store it securely — it controls your funds. Then select **Spark (L2)** as the funding source in LNbits.
+
 ## LND (REST)

 **Required env vars**
@@ -354,8 +396,8 @@ Get more info here [https://docs.strike.me/strike-oauth-connect/](https://docs.s
 ## Additional Guides

 - **[Admin UI](./admin_ui.md)** — Manage server settings via a clean UI (avoid editing `.env` by hand).
- **[User Roles](./User_Roles.md)** — Quick Overview of existing Roles in LNBits.
- **[Funding sources](./funding-sources_table.md)** — What’s available and how to enable/configure each.
+- **[User Roles](./user_roles.md)** — Quick Overview of existing Roles in LNBits.
+- **[Funding sources](./funding-sources-table.md)** — What’s available and how to enable/configure each.

 ## Powered by LNbits

@@ -1,5 +1,6 @@
 from .core.services import create_invoice, pay_invoice
 from .decorators import (
+    check_account_exists,
    check_admin,
    check_super_user,
    check_user_exists,
@@ -11,6 +12,7 @@ from .exceptions import InvoiceError, PaymentError
 __all__ = [
    "InvoiceError",
    "PaymentError",
+    "check_account_exists",
    "check_admin",
    "check_super_user",
    "check_user_exists",
@@ -1,6 +1,7 @@
 import asyncio
 import glob
 import importlib
+import json
 import os
 import shutil
 import sys
@@ -35,9 +36,12 @@ from lnbits.core.tasks import (
    purge_audit_data,
    run_by_the_minute_tasks,
    wait_for_audit_data,
-    wait_for_paid_invoices,
    wait_notification_messages,
 )
+from lnbits.core.tasks import (
+    wait_for_paid_invoices as wait_for_paid_invoices_core,
+)
+from lnbits.core.wasm.extension_host import register_wasm_ext_routes
 from lnbits.exceptions import register_exception_handlers
 from lnbits.helpers import version_parse
 from lnbits.settings import settings
@@ -419,6 +423,8 @@ def register_new_ratelimiter(app: FastAPI) -> Callable:

 def register_ext_tasks(ext: Extension) -> None:
    """Register extension async tasks."""
+    if ext.extension_type == "wasm":
+        return
    ext_module = importlib.import_module(ext.module_name)

    if hasattr(ext_module, f"{ext.code}_start"):
@@ -428,6 +434,12 @@ def register_ext_tasks(ext: Extension) -> None:

 def register_ext_routes(app: FastAPI, ext: Extension) -> None:
    """Register FastAPI routes for extension."""
+    if ext.extension_type != "wasm":
+        ext.extension_type = _load_extension_type(ext.code) or ext.extension_type
+    if ext.extension_type == "wasm":
+        settings.activate_extension_paths(ext.code, ext.upgrade_hash, [])
+        register_wasm_ext_routes(app, ext)
+        return
    ext_module = importlib.import_module(ext.module_name)

    ext_route = getattr(ext_module, f"{ext.code}_ext")
@@ -453,6 +465,20 @@ def register_ext_routes(app: FastAPI, ext: Extension) -> None:
    app.include_router(router=ext_route, prefix=prefix)


+def _load_extension_type(ext_id: str) -> str | None:
+    try:
+        conf_path = Path(
+            settings.lnbits_extensions_path, "extensions", ext_id, "config.json"
+        )
+        if not conf_path.is_file():
+            return None
+        with open(conf_path, "r+") as json_file:
+            config_json = json.load(json_file)
+        return config_json.get("extension_type")
+    except Exception:
+        return None
+
+
 async def check_and_register_extensions(app: FastAPI) -> None:
    await check_installed_extensions(app)
    for ext in await get_valid_extensions(False):
@@ -476,7 +502,7 @@ def register_async_tasks() -> None:
    # core invoice listener
    invoice_queue: asyncio.Queue = asyncio.Queue()
    register_invoice_listener(invoice_queue, "core")
-    create_permanent_task(lambda: wait_for_paid_invoices(invoice_queue))
+    create_permanent_task(lambda: wait_for_paid_invoices_core(invoice_queue))

    create_permanent_task(run_by_the_minute_tasks)
    create_permanent_task(purge_audit_data)
@@ -3,6 +3,7 @@ from fastapi import APIRouter, FastAPI
 from .db import core_app_extra, db
 from .views.admin_api import admin_router
 from .views.api import api_router
+from .views.asset_api import asset_router
 from .views.audit_api import audit_router
 from .views.auth_api import auth_router
 from .views.callback_api import callback_router
@@ -44,6 +45,7 @@ def init_core_routers(app: FastAPI):
    app.include_router(webpush_router)
    app.include_router(users_router)
    app.include_router(audit_router)
+    app.include_router(asset_router)
    app.include_router(fiat_router)
    app.include_router(lnurl_router)

@@ -0,0 +1,108 @@
+from lnbits.core.db import db
+from lnbits.core.models.assets import Asset, AssetFilters, AssetInfo
+from lnbits.db import Connection, Filters, Page
+
+
+async def create_asset(
+    entry: Asset,
+    conn: Connection | None = None,
+) -> None:
+    await (conn or db).insert("assets", entry)
+
+
+async def get_user_asset_info(
+    user_id: str,
+    asset_id: str,
+    conn: Connection | None = None,
+) -> AssetInfo | None:
+    return await (conn or db).fetchone(
+        query="SELECT * from assets WHERE id = :asset_id AND user_id = :user_id",
+        values={"asset_id": asset_id, "user_id": user_id},
+        model=AssetInfo,
+    )
+
+
+async def get_asset_info(
+    asset_id: str, conn: Connection | None = None
+) -> AssetInfo | None:
+    return await (conn or db).fetchone(
+        query="SELECT * from assets WHERE id = :asset_id",
+        values={"asset_id": asset_id},
+        model=AssetInfo,
+    )
+
+
+async def get_user_asset(
+    user_id: str,
+    asset_id: str,
+    conn: Connection | None = None,
+) -> Asset | None:
+    return await (conn or db).fetchone(
+        query="SELECT * from assets WHERE id = :asset_id AND user_id = :user_id",
+        values={"asset_id": asset_id, "user_id": user_id},
+        model=Asset,
+    )
+
+
+async def get_public_asset(
+    asset_id: str,
+    conn: Connection | None = None,
+) -> Asset | None:
+    return await (conn or db).fetchone(
+        query="SELECT * from assets WHERE id = :asset_id AND is_public = true",
+        values={"asset_id": asset_id},
+        model=Asset,
+    )
+
+
+async def get_public_asset_info(
+    asset_id: str,
+    conn: Connection | None = None,
+) -> AssetInfo | None:
+    return await (conn or db).fetchone(
+        query="SELECT * from assets WHERE id = :asset_id AND is_public = true",
+        values={"asset_id": asset_id},
+        model=AssetInfo,
+    )
+
+
+async def update_user_asset_info(
+    asset: AssetInfo,
+) -> AssetInfo:
+    await db.update("assets", asset)
+    return asset
+
+
+async def delete_user_asset(
+    user_id: str, asset_id: str, conn: Connection | None = None
+) -> None:
+    await (conn or db).execute(
+        query="DELETE FROM assets WHERE id = :asset_id AND user_id = :user_id",
+        values={"asset_id": asset_id, "user_id": user_id},
+    )
+
+
+async def get_user_assets(
+    user_id: str,
+    filters: Filters[AssetFilters] | None = None,
+    conn: Connection | None = None,
+) -> Page[AssetInfo]:
+    filters = filters or Filters()
+    filters.sortby = filters.sortby or "created_at"
+    return await (conn or db).fetch_page(
+        query="SELECT * FROM assets",
+        where=["user_id = :user_id"],
+        values={"user_id": user_id},
+        filters=filters,
+        model=AssetInfo,
+        table_name="assets",
+    )
+
+
+async def get_user_assets_count(user_id: str) -> int:
+    result = await db.execute(
+        query="SELECT COUNT(*) as count FROM assets WHERE user_id = :user_id",
+        values={"user_id": user_id},
+    )
+    row = result.mappings().first()
+    return row.get("count", 0)
@@ -16,11 +16,12 @@ async def get_audit_entries(
    conn: Connection | None = None,
 ) -> Page[AuditEntry]:
    return await (conn or db).fetch_page(
-        "SELECT * from audit",
+        "SELECT * FROM audit",
        [],
        {},
        filters=filters,
        model=AuditEntry,
+        table_name="audit",
    )


@@ -1,3 +1,5 @@
+import re
+
 from lnbits.core.db import db
 from lnbits.core.models.extensions import (
    InstallableExtension,
@@ -49,7 +51,8 @@ async def drop_extension_db(ext_id: str, conn: Connection | None = None) -> None
    )
    # Check that 'ext_id' is a valid extension id and not a malicious string
    if not row:
-        raise Exception(f"Extension '{ext_id}' db version cannot be found")
+        if not re.fullmatch(r"[a-zA-Z_][a-zA-Z0-9_]*", ext_id):
+            raise Exception(f"Extension '{ext_id}' db version cannot be found")

    is_file_based_db = await Database.clean_ext_db_files(ext_id)
    if is_file_based_db:
@@ -1,3 +1,4 @@
+from datetime import datetime, timezone
 from time import time
 from typing import Any

@@ -33,13 +34,12 @@ async def get_payment(checking_id: str, conn: Connection | None = None) -> Payme

 async def get_standalone_payment(
    checking_id_or_hash: str,
-    conn: Connection | None = None,
    incoming: bool | None = False,
    wallet_id: str | None = None,
+    conn: Connection | None = None,
 ) -> Payment | None:
    clause: str = "checking_id = :checking_id OR payment_hash = :hash"
    values = {
-        "wallet_id": wallet_id,
        "checking_id": checking_id_or_hash,
        "hash": checking_id_or_hash,
    }
@@ -47,6 +47,10 @@ async def get_standalone_payment(
        clause = f"({clause}) AND amount > 0"

    if wallet_id:
+        wallet = await get_wallet(wallet_id, conn=conn)
+        if not wallet or not wallet.can_view_payments:
+            return None
+        values["wallet_id"] = wallet.source_wallet_id
        clause = f"({clause}) AND wallet_id = :wallet_id"

    row = await (conn or db).fetchone(
@@ -66,13 +70,16 @@ async def get_standalone_payment(
 async def get_wallet_payment(
    wallet_id: str, payment_hash: str, conn: Connection | None = None
 ) -> Payment | None:
+    wallet = await get_wallet(wallet_id, conn=conn)
+    if not wallet or not wallet.can_view_payments:
+        return None
    payment = await (conn or db).fetchone(
        """
        SELECT *
        FROM apipayments
        WHERE wallet_id = :wallet AND payment_hash = :hash
        """,
-        {"wallet": wallet_id, "hash": payment_hash},
+        {"wallet": wallet.source_wallet_id, "hash": payment_hash},
        Payment,
    )
    return payment
@@ -118,7 +125,6 @@ async def get_payments_paginated(  # noqa: C901
    Filters payments to be returned by:
      - complete | pending | failed | outgoing | incoming.
    """
-
    values: dict[str, Any] = {
        "time": since,
    }
@@ -128,7 +134,11 @@ async def get_payments_paginated(  # noqa: C901
        clause.append(f"time > {db.timestamp_placeholder('time')}")

    if wallet_id:
-        values["wallet_id"] = wallet_id
+        wallet = await get_wallet(wallet_id, conn=conn)
+        if not wallet or not wallet.can_view_payments:
+            return Page(data=[], total=0)
+
+        values["wallet_id"] = wallet.source_wallet_id
        clause.append("wallet_id = :wallet_id")
    elif user_id:
        only_user_wallets = await _only_user_wallets_statement(user_id, conn=conn)
@@ -171,6 +181,7 @@ async def get_payments_paginated(  # noqa: C901
        values,
        filters=filters,
        model=Payment,
+        table_name="apipayments",
    )


@@ -282,6 +293,7 @@ async def create_payment(
        fee=-abs(data.fee),
        tag=extra.get("tag", None),
        extra=extra,
+        labels=data.labels or [],
    )

    await (conn or db).insert("apipayments", payment)
@@ -293,8 +305,16 @@ async def update_payment_checking_id(
    checking_id: str, new_checking_id: str, conn: Connection | None = None
 ) -> None:
    await (conn or db).execute(
-        "UPDATE apipayments SET checking_id = :new_id WHERE checking_id = :old_id",
-        {"new_id": new_checking_id, "old_id": checking_id},
+        f"""
+            UPDATE apipayments
+            SET checking_id = :new_id, updated_at = {db.timestamp_placeholder('now')}
+            WHERE checking_id = :old_id
+        """,  # noqa: S608
+        {
+            "new_id": new_checking_id,
+            "old_id": checking_id,
+            "now": int(time()),
+        },
    )


@@ -303,6 +323,7 @@ async def update_payment(
    new_checking_id: str | None = None,
    conn: Connection | None = None,
 ) -> None:
+    payment.updated_at = datetime.now(timezone.utc)
    await (conn or db).update(
        "apipayments", payment, "WHERE checking_id = :checking_id"
    )
@@ -314,13 +335,14 @@ async def get_payments_history(
    wallet_id: str | None = None,
    group: DateTrunc = "day",
    filters: Filters | None = None,
+    conn: Connection | None = None,
 ) -> list[PaymentHistoryPoint]:
    if not filters:
        filters = Filters()

    date_trunc = db.datetime_grouping(group)

-    values = {
+    values: dict[str, Any] = {
        "wallet_id": wallet_id,
    }
    # count outgoing payments if they are still pending
@@ -349,13 +371,13 @@ async def get_payments_history(
        filters.values(values),
    )
    if wallet_id:
-        wallet = await get_wallet(wallet_id)
-        if wallet:
-            balance = wallet.balance_msat
-        else:
-            raise ValueError("Unknown wallet")
+        wallet = await get_wallet(wallet_id, conn=conn)
+        if not wallet or not wallet.can_view_payments:
+            return []
+        balance = wallet.balance_msat
+        values["wallet_id"] = wallet.source_wallet_id
    else:
-        balance = await get_total_balance()
+        balance = await get_total_balance(conn=conn)

    # since we dont know the balance at the starting point,
    # we take the current balance and walk backwards
@@ -4,10 +4,12 @@ from typing import Any
 from uuid import uuid4

 from lnbits.core.crud.extensions import get_user_active_extensions_ids
-from lnbits.core.crud.wallets import get_wallets
+from lnbits.core.crud.wallets import clear_wallet_cache, create_wallet, get_wallets
 from lnbits.core.db import db
 from lnbits.core.models import UserAcls
 from lnbits.db import Connection, Filters, Page
+from lnbits.helpers import sha256s
+from lnbits.utils.cache import cache

 from ..models import (
    Account,
@@ -30,9 +32,9 @@ async def create_account(
    return account


-async def update_account(account: Account) -> Account:
+async def update_account(account: Account, conn: Connection | None = None) -> Account:
    account.updated_at = datetime.now(timezone.utc)
-    await db.update("accounts", account)
+    await (conn or db).update("accounts", account)
    return account


@@ -41,6 +43,7 @@ async def delete_account(user_id: str, conn: Connection | None = None) -> None:
        "DELETE from accounts WHERE id = :user",
        {"user": user_id},
    )
+    await clear_user_id_cache(user_id)


 async def get_accounts(
@@ -69,6 +72,7 @@ async def get_accounts(
            accounts.email,
            accounts.pubkey,
            accounts.external_id,
+            accounts.activated,
            SUM(COALESCE((
                SELECT balance FROM balances WHERE wallet_id = wallets.id
            ), 0)) as balance_msat,
@@ -89,15 +93,22 @@ async def get_accounts(
        filters=filters,
        model=AccountOverview,
        group_by=["accounts.id"],
+        table_name="accounts",
    )


-async def get_account(user_id: str, conn: Connection | None = None) -> Account | None:
+async def get_account(
+    user_id: str, active_only: bool = True, conn: Connection | None = None
+) -> Account | None:
    if len(user_id) == 0:
        return None
+
    return await (conn or db).fetchone(
-        "SELECT * FROM accounts WHERE id = :id",
-        {"id": user_id},
+        """
+            SELECT * FROM accounts
+            WHERE id = :id AND (activated = true OR activated = :activated)
+        """,
+        {"id": user_id, "activated": active_only},
        Account,
    )

@@ -123,66 +134,98 @@ async def delete_accounts_no_wallets(


 async def get_account_by_username(
-    username: str, conn: Connection | None = None
+    username: str, active_only: bool = True, conn: Connection | None = None
 ) -> Account | None:
    if len(username) == 0:
        return None
+
    return await (conn or db).fetchone(
-        "SELECT * FROM accounts WHERE LOWER(username) = :username",
-        {"username": username.lower()},
+        """
+            SELECT * FROM accounts
+            WHERE
+                LOWER(username) = :username
+                AND (activated = true OR activated = :activated)
+        """,
+        {"username": username.lower(), "activated": active_only},
        Account,
    )


 async def get_account_by_pubkey(
-    pubkey: str, conn: Connection | None = None
+    pubkey: str, active_only: bool = True, conn: Connection | None = None
 ) -> Account | None:
    return await (conn or db).fetchone(
-        "SELECT * FROM accounts WHERE LOWER(pubkey) = :pubkey",
-        {"pubkey": pubkey.lower()},
+        """
+            SELECT * FROM accounts
+            WHERE
+                LOWER(pubkey) = :pubkey
+                AND (activated = true OR activated = :activated)
+        """,
+        {"pubkey": pubkey.lower(), "activated": active_only},
        Account,
    )


 async def get_account_by_email(
-    email: str, conn: Connection | None = None
+    email: str, active_only: bool = True, conn: Connection | None = None
 ) -> Account | None:
    if len(email) == 0:
        return None
+
    return await (conn or db).fetchone(
-        "SELECT * FROM accounts WHERE LOWER(email) = :email",
-        {"email": email.lower()},
+        """
+            SELECT * FROM accounts
+            WHERE
+                LOWER(email) = :email
+                AND (activated = true OR activated = :activated)
+        """,
+        {"email": email.lower(), "activated": active_only},
        Account,
    )


 async def get_account_by_username_or_email(
-    username_or_email: str, conn: Connection | None = None
+    username_or_email: str,
+    active_only: bool = True,
+    conn: Connection | None = None,
 ) -> Account | None:
+
    return await (conn or db).fetchone(
        """
            SELECT * FROM accounts
-            WHERE LOWER(email) = :value or LOWER(username) = :value
+            WHERE
+                (LOWER(email) = :value or LOWER(username) = :value)
+                AND (activated = true OR activated = :activated)
        """,
-        {"value": username_or_email.lower()},
+        {"value": username_or_email.lower(), "activated": active_only},
        Account,
    )


-async def get_user(user_id: str, conn: Connection | None = None) -> User | None:
-    account = await get_account(user_id, conn)
-    if not account:
-        return None
-    return await get_user_from_account(account, conn)
+async def get_user(
+    user_id: str, active_only: bool = True, conn: Connection | None = None
+) -> User | None:
+    async with db.reuse_conn(conn) if conn else db.connect() as conn:
+        account = await get_account(user_id, active_only, conn=conn)
+        if not account:
+            return None
+        return await get_user_from_account(account, conn=conn)


 async def get_user_from_account(
    account: Account, conn: Connection | None = None
 ) -> User | None:
-    extensions = await get_user_active_extensions_ids(account.id, conn)
-    wallets = await get_wallets(account.id, False, conn=conn)
+    async with db.reuse_conn(conn) if conn else db.connect() as conn:
+        extensions = await get_user_active_extensions_ids(account.id, conn=conn)
+        wallets = await get_wallets(account.id, deleted=False, conn=conn)
+
+        if len(wallets) == 0:
+            wallet = await create_wallet(user_id=account.id, conn=conn)
+            wallets.append(wallet)
+
    return User(
        id=account.id,
+        activated=account.activated,
        email=account.email,
        username=account.username,
        pubkey=account.pubkey,
@@ -196,21 +239,43 @@ async def get_user_from_account(
        super_user=account.is_super_user,
        fiat_providers=account.fiat_providers,
        has_password=account.password_hash is not None,
+        ui_customization=account.ui_customization or {},
    )


-async def update_user_access_control_list(user_acls: UserAcls):
+async def update_user_access_control_list(
+    user_acls: UserAcls, conn: Connection | None = None
+):
    user_acls.updated_at = datetime.now(timezone.utc)
-    await db.update("accounts", user_acls)
+    await (conn or db).update("accounts", user_acls)


 async def get_user_access_control_lists(
-    user_id: str, conn: Connection | None = None
+    user_id: str, active_only: bool = True, conn: Connection | None = None
 ) -> UserAcls:
    user_acls = await (conn or db).fetchone(
-        "SELECT id, access_control_list FROM accounts WHERE id = :id",
-        {"id": user_id},
+        """
+            SELECT id, access_control_list FROM accounts
+            WHERE id = :user_id AND (activated = true OR activated = :activated)
+        """,
+        {"user_id": user_id, "activated": active_only},
        UserAcls,
    )

    return user_acls or UserAcls(id=user_id)
+
+
+async def clear_user_id_cache(user_id: str):
+    user = await get_user(user_id, active_only=True)
+    if user:
+        clear_user_cache(user)
+
+
+def clear_user_cache(user: User):
+    user_cache_key: str | None = cache.pop(
+        f"auth:user:cache_key:{sha256s(user.id)}", None
+    )
+    if user_cache_key:
+        cache.pop(user_cache_key)
+    for wallet in user.wallets:
+        clear_wallet_cache(wallet)
@@ -3,9 +3,10 @@ from time import time
 from uuid import uuid4

 from lnbits.core.db import db
-from lnbits.core.models.wallets import WalletsFilters
+from lnbits.core.models.wallets import BaseWallet, WalletsFilters, WalletType
 from lnbits.db import Connection, Filters, Page
 from lnbits.settings import settings
+from lnbits.utils.cache import cache

 from ..models import Wallet

@@ -14,17 +15,22 @@ async def create_wallet(
    *,
    user_id: str,
    wallet_name: str | None = None,
+    wallet_type: WalletType = WalletType.LIGHTNING,
+    shared_wallet_id: str | None = None,
    conn: Connection | None = None,
 ) -> Wallet:
    wallet_id = uuid4().hex
    wallet = Wallet(
        id=wallet_id,
        name=wallet_name or settings.lnbits_default_wallet_name,
+        wallet_type=wallet_type.value,
+        shared_wallet_id=shared_wallet_id,
        user=user_id,
        adminkey=uuid4().hex,
        inkey=uuid4().hex,
        currency=settings.lnbits_default_accounting_currency or "USD",
    )
+
    await (conn or db).insert("wallets", wallet)
    return wallet

@@ -39,13 +45,14 @@ async def update_wallet(


 async def delete_wallet(
-    *,
    user_id: str,
    wallet_id: str,
    deleted: bool = True,
    conn: Connection | None = None,
 ) -> None:
+    clear_wallet_id_cache(wallet_id)
    now = int(time())
+
    await (conn or db).execute(
        # Timestamp placeholder is safe from SQL injection (not user input)
        f"""
@@ -58,6 +65,7 @@ async def delete_wallet(


 async def force_delete_wallet(wallet_id: str, conn: Connection | None = None) -> None:
+    clear_wallet_id_cache(wallet_id)
    await (conn or db).execute(
        "DELETE FROM wallets WHERE id = :wallet",
        {"wallet": wallet_id},
@@ -67,6 +75,7 @@ async def force_delete_wallet(wallet_id: str, conn: Connection | None = None) ->
 async def delete_wallet_by_id(
    wallet_id: str, conn: Connection | None = None
 ) -> int | None:
+    clear_wallet_id_cache(wallet_id)
    now = int(time())
    result = await (conn or db).execute(
        # Timestamp placeholder is safe from SQL injection (not user input)
@@ -103,7 +112,7 @@ async def delete_unused_wallets(
    )


-async def get_wallet(
+async def get_standalone_wallet(
    wallet_id: str, deleted: bool | None = False, conn: Connection | None = None
 ) -> Wallet | None:
    query = """
@@ -121,8 +130,23 @@ async def get_wallet(
    )


+async def get_wallet(
+    wallet_id: str, deleted: bool | None = False, conn: Connection | None = None
+) -> Wallet | None:
+    wallet = await get_standalone_wallet(wallet_id, deleted, conn)
+    if not wallet:
+        return None
+    if wallet.is_lightning_shared_wallet:
+        return await get_source_wallet(wallet, conn)
+
+    return wallet
+
+
 async def get_wallets(
-    user_id: str, deleted: bool | None = False, conn: Connection | None = None
+    user_id: str,
+    deleted: bool | None = False,
+    wallet_type: WalletType | None = None,
+    conn: Connection | None = None,
 ) -> list[Wallet]:
    query = """
            SELECT *, COALESCE((
@@ -132,12 +156,20 @@ async def get_wallets(
            """
    if deleted is not None:
        query += " AND deleted = :deleted "
-    return await (conn or db).fetchall(
+    if wallet_type is not None:
+        query += " AND wallet_type = :wallet_type "
+    wallets = await (conn or db).fetchall(
        query,
-        {"user": user_id, "deleted": deleted},
+        {
+            "user": user_id,
+            "deleted": deleted,
+            "wallet_type": wallet_type.value if wallet_type else None,
+        },
        Wallet,
    )

+    return await get_source_wallets(wallets, conn)
+

 async def get_wallets_paginated(
    user_id: str,
@@ -149,7 +181,7 @@ async def get_wallets_paginated(
        deleted = False

    where: list[str] = [""" "user" = :user AND deleted = :deleted """]
-    return await (conn or db).fetch_page(
+    wallets = await (conn or db).fetch_page(
        """
            SELECT *, COALESCE((
                SELECT balance FROM balances WHERE wallet_id = wallets.id
@@ -159,20 +191,27 @@ async def get_wallets_paginated(
        values={"user": user_id, "deleted": deleted},
        filters=filters,
        model=Wallet,
+        table_name="wallets",
    )

+    wallets.data = await get_source_wallets(wallets.data, conn)
+    return wallets
+

 async def get_wallets_ids(
    user_id: str, deleted: bool | None = False, conn: Connection | None = None
 ) -> list[str]:
-    query = """SELECT id FROM wallets  WHERE "user" = :user"""
+    query = """SELECT * FROM wallets WHERE "user" = :user"""
    if deleted is not None:
-        query += " AND deleted = :deleted"
-    result: list[dict] = await (conn or db).fetchall(
+        query += " AND deleted = :deleted "
+    wallets = await (conn or db).fetchall(
        query,
        {"user": user_id, "deleted": deleted},
+        Wallet,
    )
-    return [row["id"] for row in result]
+
+    wallets = await get_source_wallets(wallets, conn)
+    return [w.source_wallet_id for w in wallets if w.can_view_payments]


 async def get_wallets_count():
@@ -185,20 +224,90 @@ async def get_wallet_for_key(
    key: str,
    conn: Connection | None = None,
 ) -> Wallet | None:
-    return await (conn or db).fetchone(
+    wallet = await (conn or db).fetchone(
        """
-        SELECT *, COALESCE((
+        SELECT wallets.*, COALESCE((
            SELECT balance FROM balances WHERE wallet_id = wallets.id
        ), 0)
        AS balance_msat FROM wallets
-        WHERE (adminkey = :key OR inkey = :key) AND deleted = false
+        INNER JOIN accounts ON wallets.user = accounts.id
+        WHERE (adminkey = :key OR inkey = :key)
+            AND deleted = false
+            AND accounts.activated = true
        """,
        {"key": key},
        Wallet,
    )
+    if not wallet:
+        return None
+
+    if wallet.is_lightning_shared_wallet:
+        mw = await get_source_wallet(wallet, conn)
+        return mw
+    return wallet
+
+
+async def get_base_wallet_for_key(
+    key: str,
+    conn: Connection | None = None,
+) -> BaseWallet | None:
+    wallet = await (conn or db).fetchone(
+        """
+        SELECT wallets.id, "user", wallet_type, adminkey, inkey FROM wallets
+        INNER JOIN accounts ON wallets.user = accounts.id
+        WHERE (adminkey = :key OR inkey = :key)
+            AND deleted = false
+            AND accounts.activated = true
+        """,
+        {"key": key},
+        BaseWallet,
+    )
+    if not wallet:
+        return None
+
+    return wallet
+
+
+async def get_source_wallet(
+    wallet: Wallet, conn: Connection | None = None
+) -> Wallet | None:
+    if not wallet.is_lightning_shared_wallet:
+        return wallet
+    if not wallet.shared_wallet_id:
+        return None
+
+    shared_wallet = await get_standalone_wallet(wallet.shared_wallet_id, False, conn)
+    if not shared_wallet:
+        return None
+    wallet.mirror_shared_wallet(shared_wallet)
+    return wallet
+
+
+async def get_source_wallets(
+    wallet: list[Wallet], conn: Connection | None = None
+) -> list[Wallet]:
+    source_wallets = []
+    for w in wallet:
+        source_wallet = await get_source_wallet(w, conn)
+        if source_wallet:
+            source_wallets.append(source_wallet)
+    return source_wallets


 async def get_total_balance(conn: Connection | None = None):
    result = await (conn or db).execute("SELECT SUM(balance) as balance FROM balances")
    row = result.mappings().first()
    return row.get("balance", 0) or 0
+
+
+def clear_wallet_id_cache(wallet_id: str):
+    cached_wallet: BaseWallet | None = cache.pop(f"auth:wallet:{wallet_id}")
+    if cached_wallet:
+        cache.pop(f"auth:x-api-key:{cached_wallet.adminkey}")
+        cache.pop(f"auth:x-api-key:{cached_wallet.inkey}")
+
+
+def clear_wallet_cache(wallet: Wallet):
+    cache.pop(f"auth:wallet:{wallet.id}")
+    cache.pop(f"auth:x-api-key:{wallet.adminkey}")
+    cache.pop(f"auth:x-api-key:{wallet.inkey}")
@@ -22,6 +22,8 @@ from lnbits.settings import settings
 async def migrate_extension_database(
    ext: InstallableExtension, current_version: DbVersion | None = None
 ):
+    if _is_wasm_extension(ext):
+        return

    try:
        ext_migrations = importlib.import_module(f"{ext.module_name}.migrations")
@@ -58,6 +60,34 @@ async def run_migration(
                        await update_migration_version(conn, db_name, version)


+def _is_wasm_extension(ext: InstallableExtension) -> bool:
+    if ext.meta and ext.meta.extension_type == "wasm":
+        return True
+
+    try:
+        import json
+        from pathlib import Path
+
+        candidate_dirs = [
+            Path(ext.ext_dir),
+            Path(settings.lnbits_extensions_path, "extensions", ext.id),
+            Path(settings.lnbits_path, "extensions", ext.id),
+            Path.cwd() / "extensions" / ext.id,
+        ]
+        for base in candidate_dirs:
+            conf_path = Path(base, "config.json")
+            if not conf_path.is_file():
+                continue
+            with open(conf_path, "r+") as json_file:
+                config_json = json.load(json_file)
+            if config_json.get("extension_type") == "wasm":
+                return True
+    except Exception as exc:
+        logger.debug(f"Failed to load extension config for '{ext.id}': {exc!s}")
+
+    return False
+
+
 def to_valid_user_id(user_id: str) -> UUID:
    if len(user_id) < 32:
        raise ValueError("User ID must have at least 128 bits")
@@ -743,3 +743,124 @@ async def m034_add_stored_paylinks_to_wallet(db: Connection):
        ALTER TABLE wallets ADD COLUMN stored_paylinks TEXT
        """
    )
+
+
+async def m035_add_wallet_type_column(db: Connection):
+    await db.execute(
+        """
+        ALTER TABLE wallets ADD COLUMN wallet_type TEXT DEFAULT 'lightning'
+        """
+    )
+
+
+async def m036_add_shared_wallet_column(db: Connection):
+    await db.execute(
+        """
+        ALTER TABLE wallets ADD COLUMN shared_wallet_id TEXT
+        """
+    )
+
+
+async def m037_create_assets_table(db: Connection):
+    await db.execute(
+        f"""
+        CREATE TABLE IF NOT EXISTS assets (
+            id TEXT PRIMARY KEY,
+            user_id TEXT NOT NULL,
+            mime_type TEXT NOT NULL,
+            is_public BOOLEAN NOT NULL DEFAULT false,
+            name TEXT NOT NULL,
+            size_bytes INT NOT NULL,
+            thumbnail_base64 TEXT,
+            thumbnail {db.blob},
+            data {db.blob} NOT NULL,
+            created_at TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
+        );
+        """
+    )
+
+
+async def m038_add_labels_for_payments(db: Connection):
+    await db.execute(
+        """
+        ALTER TABLE apipayments ADD COLUMN labels TEXT
+        """
+    )
+
+
+async def m039_index_payments(db: Connection):
+    indexes = [
+        "wallet_id",
+        "checking_id",
+        "payment_hash",
+        "amount",
+        "fee",
+        "labels",
+        "time",
+        "status",
+        "memo",
+        "created_at",
+        "updated_at",
+    ]
+    for index in indexes:
+        logger.debug(f"Creating index idx_payments_{index}...")
+        await db.execute(
+            f"""
+            CREATE INDEX IF NOT EXISTS idx_payments_{index} ON apipayments ({index});
+            """
+        )
+
+
+async def m040_index_wallets(db: Connection):
+    indexes = [
+        "id",
+        "user",
+        "deleted",
+        "adminkey",
+        "inkey",
+        "wallet_type",
+        "created_at",
+        "updated_at",
+    ]
+
+    for index in indexes:
+        logger.debug(f"Creating index idx_wallets_{index}...")
+        await db.execute(
+            f"""
+            CREATE INDEX IF NOT EXISTS idx_wallets_{index} ON wallets ("{index}");
+            """
+        )
+
+
+async def m042_index_accounts(db: Connection):
+    indexes = [
+        "id",
+        "email",
+        "username",
+        "pubkey",
+        "external_id",
+    ]
+
+    for index in indexes:
+        logger.debug(f"Creating index idx_wallets_{index}...")
+        await db.execute(
+            f"""
+            CREATE INDEX IF NOT EXISTS idx_accounts_{index} ON accounts ("{index}");
+            """
+        )
+
+
+async def m043_add_ui_customization_to_accounts(db: Connection):
+    """
+    Adds ui_customization column to accounts.
+    Used for server side persistence of UI customization settings.
+    """
+    await db.execute("ALTER TABLE accounts ADD COLUMN ui_customization TEXT")
+
+
+async def m044_add_activated_to_accounts(db: Connection):
+    """
+    Adds activated column to accounts.
+    Used for account activation status.
+    """
+    await db.execute("ALTER TABLE accounts ADD COLUMN activated BOOLEAN DEFAULT true")
@@ -46,7 +46,7 @@ from .users import (
    UserAcls,
    UserExtra,
 )
-from .wallets import BaseWallet, CreateWallet, KeyType, Wallet, WalletTypeInfo
+from .wallets import CreateWallet, KeyType, Wallet, WalletInfo, WalletTypeInfo
 from .webpush import CreateWebPushSubscription, WebPushSubscription

 __all__ = [
@@ -57,7 +57,6 @@ __all__ = [
    "AuditEntry",
    "AuditFilters",
    "BalanceDelta",
-    "BaseWallet",
    "Callback",
    "CancelInvoice",
    "ConversionData",
@@ -99,6 +98,7 @@ __all__ = [
    "UserAcls",
    "UserExtra",
    "Wallet",
+    "WalletInfo",
    "WalletTypeInfo",
    "WebPushSubscription",
 ]
@@ -0,0 +1,37 @@
+from __future__ import annotations
+
+from datetime import datetime, timezone
+
+from pydantic import BaseModel, Field
+
+from lnbits.db import FilterModel
+
+
+class AssetInfo(BaseModel):
+    id: str
+    mime_type: str
+    name: str
+    is_public: bool = False
+    size_bytes: int
+    thumbnail_base64: str | None = None
+    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
+
+
+class Asset(AssetInfo):
+    user_id: str
+    data: bytes
+
+
+class AssetUpdate(BaseModel):
+    name: str | None = None
+    is_public: bool | None = None
+
+
+class AssetFilters(FilterModel):
+    __search_fields__ = ["name"]
+    __sort_fields__ = [
+        "created_at",
+        "name",
+    ]
+
+    name: str | None = None
@@ -6,12 +6,13 @@ import json
 import os
 import shutil
 import zipfile
+from asyncio.tasks import create_task
 from pathlib import Path
 from typing import Any

 import httpx
 from loguru import logger
-from pydantic import BaseModel
+from pydantic import BaseModel, Field

 from lnbits.helpers import (
    download_url,
@@ -20,6 +21,7 @@ from lnbits.helpers import (
    version_parse,
 )
 from lnbits.settings import settings
+from lnbits.utils.cache import cache


 class ExplicitRelease(BaseModel):
@@ -81,6 +83,11 @@ class ExtensionConfig(BaseModel):
    warning: str | None = ""
    min_lnbits_version: str | None
    max_lnbits_version: str | None
+    permissions: list[ExtensionPermission] = []
+    extension_type: str | None = "python"
+    public_kv_keys: list[str] = []
+    public_wasm_functions: list[str] = []
+    payment_tags: list[str] = []

    def is_version_compatible(self) -> bool:
        return is_lnbits_version_ok(self.min_lnbits_version, self.max_lnbits_version)
@@ -113,6 +120,20 @@ class PayToEnableInfo(BaseModel):
 class UserExtensionInfo(BaseModel):
    paid_to_enable: bool | None = False
    payment_hash_to_enable: str | None = None
+    granted_permissions: list[str] | None = None
+    granted_payment_tags: list[str] | None = None
+
+
+class ExtensionPermission(BaseModel):
+    id: str
+    label: str
+    description: str
+    dangerous: bool | None = False
+
+
+class ExtensionPermissionsGrant(BaseModel):
+    permissions: list[str] = []
+    payment_tags: list[str] = []


 class UserExtension(BaseModel):
@@ -145,6 +166,10 @@ class Extension(BaseModel):
    short_description: str | None = None
    tile: str | None = None
    upgrade_hash: str | None = ""
+    extension_type: str | None = None
+    public_kv_keys: list[str] = []
+    public_wasm_functions: list[str] = []
+    payment_tags: list[str] = []

    @property
    def module_name(self) -> str:
@@ -168,6 +193,12 @@ class Extension(BaseModel):
            short_description=ext_info.short_description,
            tile=ext_info.icon,
            upgrade_hash=ext_info.hash if ext_info.ext_upgrade_dir.is_dir() else "",
+            extension_type=ext_info.meta.extension_type if ext_info.meta else None,
+            public_kv_keys=ext_info.meta.public_kv_keys if ext_info.meta else [],
+            public_wasm_functions=(
+                ext_info.meta.public_wasm_functions if ext_info.meta else []
+            ),
+            payment_tags=ext_info.meta.payment_tags if ext_info.meta else [],
        )


@@ -267,10 +298,30 @@ class ExtensionRelease(BaseModel):
    async def get_github_releases(cls, org: str, repo: str) -> list[ExtensionRelease]:
        try:
            github_releases = await cls.fetch_github_releases(org, repo)
-            return [
+            extension_releases = [
                ExtensionRelease.from_github_release(f"{org}/{repo}", r)
                for r in github_releases
            ]
+            for release in extension_releases:
+                if not release.details_link:
+                    continue
+                try:
+                    config = await ExtensionConfig.fetch_github_release_config(
+                        org, repo, release.version
+                    )
+                except Exception as e:
+                    logger.warning(e)
+                    config = None
+                if not config:
+                    continue
+
+                release.min_lnbits_version = config.min_lnbits_version
+                release.max_lnbits_version = config.max_lnbits_version
+                release.is_version_compatible = config.is_version_compatible()
+
+                release.icon = icon_to_github_url(f"{org}/{repo}", config.tile)
+
+            return extension_releases
        except Exception as e:
            logger.warning(e)
            return []
@@ -309,6 +360,11 @@ class ExtensionMeta(BaseModel):
    pay_to_enable: PayToEnableInfo | None = None
    payments: list[ReleasePaymentInfo] = []
    dependencies: list[str] = []
+    permissions: list[ExtensionPermission] = []
+    extension_type: str | None = "python"
+    public_kv_keys: list[str] = []
+    public_wasm_functions: list[str] = []
+    payment_tags: list[str] = []
    archive: str | None = None
    featured: bool = False
    paid_features: str | None = None
@@ -432,6 +488,14 @@ class InstallableExtension(BaseModel):

            self.name = config_json.get("name")
            self.short_description = config_json.get("short_description")
+            if self.meta:
+                self.meta.permissions = config_json.get("permissions", [])
+                self.meta.extension_type = config_json.get("extension_type", "python")
+                self.meta.public_kv_keys = config_json.get("public_kv_keys", [])
+                self.meta.public_wasm_functions = config_json.get(
+                    "public_wasm_functions", []
+                )
+                self.meta.payment_tags = config_json.get("payment_tags", [])

            if (
                self.meta
@@ -550,6 +614,11 @@ class InstallableExtension(BaseModel):
                    latest_release=ExtensionRelease.from_github_release(
                        source_repo, latest_release
                    ),
+                    permissions=config.permissions,
+                    extension_type=config.extension_type,
+                    public_kv_keys=config.public_kv_keys,
+                    public_wasm_functions=config.public_wasm_functions,
+                    payment_tags=config.payment_tags,
                ),
            )
        except Exception as e:
@@ -595,7 +664,14 @@ class InstallableExtension(BaseModel):
                            source_repo=f"{conf_path}",
                            min_lnbits_version=config_json.get("min_lnbits_version"),
                            max_lnbits_version=config_json.get("max_lnbits_version"),
-                        )
+                        ),
+                        permissions=config_json.get("permissions", []),
+                        extension_type=config_json.get("extension_type", "python"),
+                        public_kv_keys=config_json.get("public_kv_keys", []),
+                        public_wasm_functions=config_json.get(
+                            "public_wasm_functions", []
+                        ),
+                        payment_tags=config_json.get("payment_tags", []),
                    ),
                )

@@ -606,6 +682,37 @@ class InstallableExtension(BaseModel):

    @classmethod
    async def get_installable_extensions(
+        cls, post_refresh_cache: bool = False
+    ) -> list[InstallableExtension]:
+        extension_list: list[InstallableExtension] = []
+
+        cache_key = "extensions:installable"
+        cache_value = cache.value(cache_key)
+        if not cache_value:
+            extension_list = await cls._get_installable_extensions()
+            cache.set(cache_key, extension_list, expiry=3600)  # one hour
+            return extension_list
+
+        if cache_value.older_than(10 * 60) or post_refresh_cache:
+            # refresh cache in background if older than 10 minutes or requested
+            create_task(cls._refresh_installable_extensions_cache())
+
+        extension_list = cache_value.value  # type: ignore
+        return extension_list
+
+    @classmethod
+    async def _refresh_installable_extensions_cache(
+        cls,
+    ) -> None:
+        cache_key = "extensions:installable"
+        extension_list: list[InstallableExtension] = (
+            await cls._get_installable_extensions()
+        )
+
+        cache.set(cache_key, extension_list, expiry=3600)
+
+    @classmethod
+    async def _get_installable_extensions(
        cls,
    ) -> list[InstallableExtension]:
        extension_list: list[InstallableExtension] = []
@@ -744,6 +851,32 @@ class ExtensionDetailsRequest(BaseModel):
    version: str


+class ExtensionReviewsStatus(BaseModel):
+    tag: str
+    avg_rating: float
+    review_count: int
+
+
+class CreateExtensionReview(BaseModel):
+    tag: str
+    name: str | None = Field(None)
+    rating: int = Field(..., ge=0, le=1000)
+    comment: str | None = Field(None)
+
+
+class ExtensionReviewPaymentRequest(BaseModel):
+    payment_hash: str
+    payment_request: str
+
+
+class ExtensionReview(BaseModel):
+    id: str
+    name: str | None = Field(default=None)
+    tag: str | None = Field(default=None)
+    rating: int = Field(default=0, ge=0, le=1000)
+    comment: str | None = Field(default=None)
+
+
 async def github_api_get(url: str, error_msg: str | None) -> Any:
    headers = {"User-Agent": settings.user_agent}
    if settings.lnbits_ext_github_token:
@@ -762,3 +895,6 @@ def icon_to_github_url(source_repo: str, path: str | None) -> str:
    _, _, *rest = path.split("/")
    tail = "/".join(rest)
    return f"https://github.com/{source_repo}/raw/main/{tail}"
+
+
+ExtensionConfig.update_forward_refs(ExtensionPermission=ExtensionPermission)
@@ -1,6 +1,8 @@
 from __future__ import annotations

 import json
+import random
+import uuid
 from datetime import datetime, timedelta, timezone
 from typing import Any, Literal

@@ -55,6 +57,29 @@ class DataField(BaseModel):
            field_type += ' = "sat"'
        return f"{field_name}: {field_type}"

+    def field_to_random_value(self) -> str:
+        field_name = camel_to_snake(self.name)
+        field_value: Any = f'"{self.type}"'
+        if self.type == "json":
+            field_value = '"{}"'
+        elif self.type == "wallet":
+            field_value = f'"{uuid.uuid4()}"'
+        elif self.type == "currency":
+            field_value = '"sat"'
+        elif self.type in ["str", "text"]:
+            field_value = f'"{field_name}_{urlsafe_short_hash()}"'
+        elif self.type == "int":
+            field_value = random.randint(1, 100)  # noqa: S311
+        elif self.type == "float":
+            field_value = random.uniform(1.0, 100.0)  # noqa: S311
+        elif self.type == "bool":
+            field_value = random.choice([True, False])  # noqa: S311
+        elif self.type == "datetime":
+            random_days = random.randint(-30, 30)  # noqa: S311
+            random_date = datetime.now(timezone.utc) - timedelta(days=random_days)
+            field_value = f"""datetime.fromisoformat("{random_date.isoformat()}")"""
+        return f"{field_name} = {field_value},"
+
    def field_to_js(self) -> str:
        field_name = camel_to_snake(self.name)
        default_value = "null"
@@ -6,23 +6,16 @@ from typing import Literal

 from fastapi import Query
 from lnurl import LnurlWithdrawResponse
+from loguru import logger
 from pydantic import BaseModel, Field, validator

 from lnbits.db import FilterModel
-from lnbits.fiat import get_fiat_provider
 from lnbits.fiat.base import (
-    FiatPaymentFailedStatus,
-    FiatPaymentPendingStatus,
    FiatPaymentStatus,
-    FiatPaymentSuccessStatus,
 )
 from lnbits.utils.exchange_rates import allowed_currencies
-from lnbits.wallets import get_funding_source
 from lnbits.wallets.base import (
-    PaymentFailedStatus,
-    PaymentPendingStatus,
    PaymentStatus,
-    PaymentSuccessStatus,
 )


@@ -59,6 +52,7 @@ class CreatePayment(BaseModel):
    expiry: datetime | None = None
    webhook: str | None = None
    fee: int = 0
+    labels: list[str] | None = None


 class Payment(BaseModel):
@@ -81,6 +75,7 @@ class Payment(BaseModel):
    time: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
    updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
+    labels: list[str] = []
    extra: dict = {}

    def __init__(self, **data):
@@ -128,65 +123,45 @@ class Payment(BaseModel):
            "fiat_"
        )

+    # DEPRECATED: in v1.5.0, use service check_payment_status instead
    async def check_status(
        self, skip_internal_payment_notifications: bool | None = False
    ) -> PaymentStatus:
-        if self.is_internal:
-            if self.success:
-                return PaymentSuccessStatus()
-            if self.failed:
-                return PaymentFailedStatus()
-            if self.is_in and self.fiat_provider:
-                fiat_status = await self.check_fiat_status(
-                    skip_internal_payment_notifications
-                )
-                return PaymentStatus(paid=fiat_status.paid)
-            return PaymentPendingStatus()
-        funding_source = get_funding_source()
-        if self.is_out:
-            status = await funding_source.get_payment_status(self.checking_id)
-        else:
-            status = await funding_source.get_invoice_status(self.checking_id)
-        return status
+        logger.warning("payment.check_status() is deprecated.")
+        from lnbits.core.services.payments import check_payment_status

+        return await check_payment_status(self, skip_internal_payment_notifications)
+
+    # DEPRECATED: in v1.5.0, use service check_payment_status instead
    async def check_fiat_status(
        self, skip_internal_payment_notifications: bool | None = False
    ) -> FiatPaymentStatus:
-        if not self.is_internal:
-            return FiatPaymentPendingStatus()
-        if self.success:
-            return FiatPaymentSuccessStatus()
-        if self.failed:
-            return FiatPaymentFailedStatus()
+        logger.warning("payment.check_fiat_status() is deprecated.")
+        from lnbits.core.services.fiat_providers import check_fiat_status

-        if not self.fiat_provider:
-            return FiatPaymentPendingStatus()
-
-        checking_id = self.extra.get("fiat_checking_id")
-        if not checking_id:
-            return FiatPaymentPendingStatus()
-
-        fiat_provider = await get_fiat_provider(self.fiat_provider)
-        if not fiat_provider:
-            return FiatPaymentPendingStatus()
-        fiat_status = await fiat_provider.get_invoice_status(checking_id)
-
-        if skip_internal_payment_notifications:
-            return fiat_status
-
-        if fiat_status.success:
-            # notify receivers asynchronously
-            from lnbits.tasks import internal_invoice_queue
-
-            await internal_invoice_queue.put(self.checking_id)
-
-        return fiat_status
+        return await check_fiat_status(self, skip_internal_payment_notifications)


 class PaymentFilters(FilterModel):
-    __search_fields__ = ["memo", "amount", "wallet_id", "tag", "status", "time"]
+    __search_fields__ = [
+        "memo",
+        "amount",
+        "wallet_id",
+        "tag",
+        "status",
+        "time",
+        "labels",
+    ]

-    __sort_fields__ = ["created_at", "amount", "fee", "memo", "time", "tag"]
+    __sort_fields__ = [
+        "created_at",
+        "updated_at",
+        "amount",
+        "fee",
+        "memo",
+        "time",
+        "tag",
+    ]

    status: str | None
    tag: str | None
@@ -198,6 +173,7 @@ class PaymentFilters(FilterModel):
    preimage: str | None
    payment_hash: str | None
    wallet_id: str | None
+    labels: str | None


 class PaymentDataPoint(BaseModel):
@@ -272,6 +248,7 @@ class CreateInvoice(BaseModel):
    bolt11: str | None = None
    lnurl_withdraw: LnurlWithdrawResponse | None = None
    fiat_provider: str | None = None
+    labels: list[str] = []

    @validator("payment_hash")
    def check_hex(cls, v):
@@ -320,3 +297,7 @@ class CancelInvoice(BaseModel):
    def check_hex(cls, v):
        _ = bytes.fromhex(v)
        return v
+
+
+class UpdatePaymentLabels(BaseModel):
+    labels: list[str] = []
@@ -12,6 +12,7 @@ from lnbits.db import FilterModel
 from lnbits.helpers import (
    is_valid_email_address,
    is_valid_external_id,
+    is_valid_label,
    is_valid_pubkey,
    is_valid_username,
 )
@@ -29,6 +30,21 @@ class UserNotifications(BaseModel):
    incoming_payments_sats: int = 0


+class WalletInviteRequest(BaseModel):
+    request_id: str
+    from_user_name: str | None = None
+    to_wallet_id: str
+    to_wallet_name: str
+
+
+class UserLabel(BaseModel):
+    name: str = Field(regex=r"([A-Za-z0-9 ._-]{1,100}$)")
+    description: str | None = Field(default=None, max_length=250)
+    color: str | None = Field(
+        default=None, regex=r"^#[0-9A-Fa-f]{6}$"
+    )  # e.g., "#RRGGBB"
+
+
 class UserExtra(BaseModel):
    email_verified: bool | None = False
    first_name: str | None = None
@@ -46,6 +62,55 @@ class UserExtra(BaseModel):

    notifications: UserNotifications = UserNotifications()

+    wallet_invite_requests: list[WalletInviteRequest] = []
+
+    labels: list[UserLabel] = []
+
+    def add_wallet_invite_request(
+        self,
+        request_id: str,
+        to_wallet_id: str,
+        to_wallet_name: str,
+        from_user_name: str | None = None,
+    ) -> WalletInviteRequest:
+        self.remove_wallet_invite_request(request_id)
+        invite = WalletInviteRequest(
+            request_id=request_id,
+            from_user_name=from_user_name,
+            to_wallet_id=to_wallet_id,
+            to_wallet_name=to_wallet_name,
+        )
+        self.wallet_invite_requests.append(invite)
+        return invite
+
+    def find_wallet_invite_request(self, request_id: str) -> WalletInviteRequest | None:
+        for invite in self.wallet_invite_requests:
+            if invite.request_id == request_id:
+                return invite
+        return None
+
+    def validate_labels(self):
+        seen_labels = set()
+        for label in self.labels:
+            if not label.name:
+                raise ValueError("Label name cannot be empty.")
+            # apply the same rule for labels as for usernames
+            if not is_valid_label(label.name):
+                raise ValueError(f"Invalid label name: {label.name}")
+            if label.name in seen_labels:
+                raise ValueError(f"Duplicate label name: {label.name}")
+            seen_labels.add(label.name)
+
+    def remove_wallet_invite_request(
+        self,
+        request_id: str,
+    ):
+        self.wallet_invite_requests = [
+            invite
+            for invite in self.wallet_invite_requests
+            if invite.request_id != request_id
+        ]
+

 class EndpointAccess(BaseModel):
    path: str
@@ -107,14 +172,23 @@ class UserAcls(BaseModel):
        return None


-class Account(BaseModel):
+class AccountId(BaseModel):
    id: str
+
+    @property
+    def is_admin_id(self) -> bool:
+        return settings.is_admin_user(self.id)
+
+
+class Account(AccountId):
+    activated: bool = True
    external_id: str | None = None  # for external account linking
    username: str | None = None
    password_hash: str | None = None
    pubkey: str | None = None
    email: str | None = None
    extra: UserExtra = UserExtra()
+    ui_customization: dict = Field(default_factory=dict)

    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
    updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
@@ -129,6 +203,10 @@ class Account(BaseModel):
        self.is_admin = settings.is_admin_user(self.id)
        self.fiat_providers = settings.get_fiat_providers_for_user(self.id)

+    @property
+    def has_password(self) -> bool:
+        return self.password_hash is not None
+
    def hash_password(self, password: str) -> str:
        """sets and returns the hashed password"""
        salt = gensalt()
@@ -160,8 +238,11 @@ class Account(BaseModel):
        if user_uuid4.hex != self.id:
            raise ValueError("User ID is not valid UUID4 hex string.")

+        self.extra.validate_labels()
+

 class AccountOverview(Account):
+    activated: bool = True
    transaction_count: int | None = 0
    wallet_count: int | None = 0
    balance_msat: int | None = 0
@@ -170,7 +251,7 @@ class AccountOverview(Account):

 class AccountFilters(FilterModel):
    __search_fields__ = [
-        "user",
+        "id",
        "email",
        "username",
        "pubkey",
@@ -178,17 +259,18 @@ class AccountFilters(FilterModel):
        "wallet_id",
    ]
    __sort_fields__ = [
-        "balance_msat",
+        "id",
        "email",
        "username",
-        "transaction_count",
-        "wallet_count",
-        "last_payment",
+        "pubkey",
+        "external_id",
+        "created_at",
+        "updated_at",
    ]

-    email: str | None = None
-    user: str | None = None
+    id: str | None = None
    username: str | None = None
+    email: str | None = None
    pubkey: str | None = None
    external_id: str | None = None
    wallet_id: str | None = None
@@ -196,6 +278,7 @@ class AccountFilters(FilterModel):

 class User(BaseModel):
    id: str
+    activated: bool = True
    created_at: datetime
    updated_at: datetime
    email: str | None = None
@@ -209,6 +292,7 @@ class User(BaseModel):
    fiat_providers: list[str] = []
    has_password: bool = False
    extra: UserExtra = UserExtra()
+    ui_customization: dict = Field(default_factory=dict)

    @property
    def wallet_ids(self) -> list[str]:
@@ -234,6 +318,7 @@ class RegisterUser(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)
+    invitation_code: str | None = Query(default=None, max_length=256)


 class CreateUser(BaseModel):
@@ -277,6 +362,7 @@ 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)
+    first_install_token: str | None = Query(None)


 class LoginUsr(BaseModel):
@@ -4,16 +4,14 @@ from dataclasses import dataclass
 from datetime import datetime, timezone
 from enum import Enum

-from lnurl import encode as lnurl_encode
 from pydantic import BaseModel, Field

 from lnbits.core.models.lnurl import StoredPayLinks
 from lnbits.db import FilterModel
-from lnbits.helpers import url_for
 from lnbits.settings import settings


-class BaseWallet(BaseModel):
+class WalletInfo(BaseModel):
    id: str
    name: str
    adminkey: str
@@ -21,18 +19,109 @@ class BaseWallet(BaseModel):
    balance_msat: int


+class WalletType(Enum):
+    LIGHTNING = "lightning"
+    LIGHTNING_SHARED = "lightning-shared"
+
+
+class WalletPermission(Enum):
+    VIEW_PAYMENTS = "view-payments"
+    RECEIVE_PAYMENTS = "receive-payments"
+    SEND_PAYMENTS = "send-payments"
+
+    def __str__(self):
+        return self.value
+
+
+class WalletShareStatus(Enum):
+    INVITE_SENT = "invite_sent"
+    APPROVED = "approved"
+
+
+class WalletSharePermission(BaseModel):
+    # unique identifier for this share request
+    request_id: str | None = None
+    # username of the invited user
+    username: str
+    # ID of the wallet being shared with
+    shared_with_wallet_id: str | None = None
+    # permissions being granted
+    permissions: list[WalletPermission] = []
+    # status of the share request
+    status: WalletShareStatus
+    comment: str | None = None
+
+    def approve(
+        self,
+        permissions: list[WalletPermission] | None = None,
+        shared_with_wallet_id: str | None = None,
+    ):
+        self.status = WalletShareStatus.APPROVED
+        if permissions is not None:
+            self.permissions = permissions
+        if shared_with_wallet_id is not None:
+            self.shared_with_wallet_id = shared_with_wallet_id
+
+    @property
+    def is_approved(self) -> bool:
+        return self.status == WalletShareStatus.APPROVED
+
+
 class WalletExtra(BaseModel):
    icon: str = "flash_on"
    color: str = "primary"
    pinned: bool = False
+    # What permissions this wallet grants when it's shared with other users
+    shared_with: list[WalletSharePermission] = []
+
+    def invite_user_to_shared_wallet(
+        self,
+        request_id: str,
+        request_type: WalletShareStatus,
+        username: str,
+        permissions: list[WalletPermission] | None = None,
+    ) -> WalletSharePermission:
+        share = WalletSharePermission(
+            request_id=request_id,
+            username=username,
+            status=request_type,
+            permissions=permissions or [],
+        )
+        self.shared_with.append(share)
+        return share
+
+    def find_share_by_id(self, request_id: str) -> WalletSharePermission | None:
+        for share in self.shared_with:
+            if share.request_id == request_id:
+                return share
+        return None
+
+    def find_share_for_wallet(
+        self, shared_with_wallet_id: str
+    ) -> WalletSharePermission | None:
+        for share in self.shared_with:
+            if share.shared_with_wallet_id == shared_with_wallet_id:
+                return share
+        return None
+
+    def remove_share_by_id(self, request_id: str):
+        self.shared_with = [
+            share for share in self.shared_with if share.request_id != request_id
+        ]


-class Wallet(BaseModel):
+class BaseWallet(BaseModel):
    id: str
    user: str
-    name: str
+    wallet_type: str = WalletType.LIGHTNING.value
    adminkey: str
    inkey: str
+
+
+class Wallet(BaseWallet):
+    name: str
+    # Must be set only for shared wallets
+    shared_wallet_id: str | None = None
    deleted: bool = False
    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
    updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
@@ -40,6 +129,65 @@ class Wallet(BaseModel):
    balance_msat: int = Field(default=0, no_database=True)
    extra: WalletExtra = WalletExtra()
    stored_paylinks: StoredPayLinks = StoredPayLinks()
+    # What permission this wallet has when it's a shared wallet
+    share_permissions: list[WalletPermission] = Field(default=[], no_database=True)
+
+    def __init__(self, **data):
+        super().__init__(**data)
+        self._validate_data()
+
+    def mirror_shared_wallet(
+        self,
+        shared_wallet: Wallet,
+    ):
+        if not shared_wallet.is_lightning_wallet:
+            return None
+
+        self.wallet_type = WalletType.LIGHTNING_SHARED.value
+        self.shared_wallet_id = shared_wallet.id
+        self.name = shared_wallet.name
+        self.share_permissions = shared_wallet.get_share_permissions(self.id)
+
+        if len(self.share_permissions):
+            self.currency = shared_wallet.currency
+            self.balance_msat = shared_wallet.balance_msat
+
+            self.stored_paylinks = shared_wallet.stored_paylinks
+            self.extra.icon = shared_wallet.extra.icon
+            self.extra.color = shared_wallet.extra.color
+
+    def get_share_permissions(self, wallet_id: str) -> list[WalletPermission]:
+        for share in self.extra.shared_with:
+            if share.shared_with_wallet_id == wallet_id and share.is_approved:
+                return share.permissions
+        return []
+
+    def has_permission(self, permission: WalletPermission) -> bool:
+        if self.is_lightning_wallet:
+            return True
+        if self.is_lightning_shared_wallet:
+            return permission in self.share_permissions
+
+        return False
+
+    @property
+    def source_wallet_id(self) -> str:
+        """For shared wallets return the original wallet ID, else return own ID."""
+        if self.is_lightning_shared_wallet and len(self.share_permissions):
+            return self.shared_wallet_id or self.id
+        return self.id
+
+    @property
+    def can_receive_payments(self) -> bool:
+        return self.has_permission(WalletPermission.RECEIVE_PAYMENTS)
+
+    @property
+    def can_send_payments(self) -> bool:
+        return self.has_permission(WalletPermission.SEND_PAYMENTS)
+
+    @property
+    def can_view_payments(self) -> bool:
+        return self.has_permission(WalletPermission.VIEW_PAYMENTS)

    @property
    def balance(self) -> int:
@@ -50,16 +198,23 @@ class Wallet(BaseModel):
        return self.balance_msat - settings.fee_reserve(self.balance_msat)

    @property
-    def lnurlwithdraw_full(self) -> str:
-        url = url_for("/withdraw", external=True, usr=self.user, wal=self.id)
-        try:
-            return lnurl_encode(url)
-        except Exception:
-            return ""
+    def is_lightning_wallet(self) -> bool:
+        return self.wallet_type == WalletType.LIGHTNING.value
+
+    @property
+    def is_lightning_shared_wallet(self) -> bool:
+        return self.wallet_type == WalletType.LIGHTNING_SHARED.value
+
+    def _validate_data(self):
+        if self.is_lightning_shared_wallet:
+            if not self.shared_wallet_id:
+                raise ValueError("Shared wallet ID must be set for shared wallets.")


 class CreateWallet(BaseModel):
    name: str | None = None
+    wallet_type: WalletType = WalletType.LIGHTNING
+    shared_wallet_id: str | None = None


 class KeyType(Enum):
@@ -78,6 +233,12 @@ class WalletTypeInfo:
    wallet: Wallet


+@dataclass
+class BaseWalletTypeInfo:
+    key_type: KeyType
+    wallet: BaseWallet
+
+
 class WalletsFilters(FilterModel):
    __search_fields__ = ["id", "name", "currency"]

@@ -1,3 +1,4 @@
+from .fiat_providers import check_fiat_status
 from .funding_source import (
    get_balance_delta,
    switch_to_voidwallet,
@@ -7,6 +8,7 @@ from .notifications import enqueue_admin_notification, send_payment_notification
 from .payments import (
    calculate_fiat_amounts,
    cancel_hold_invoice,
+    check_payment_status,
    check_transaction_status,
    check_wallet_limits,
    create_fiat_invoice,
@@ -40,6 +42,8 @@ __all__ = [
    "calculate_fiat_amounts",
    "cancel_hold_invoice",
    "check_admin_settings",
+    "check_fiat_status",
+    "check_payment_status",
    "check_transaction_status",
    "check_wallet_limits",
    "check_webpush_settings",
@@ -0,0 +1,70 @@
+import base64
+import io
+from uuid import uuid4
+
+from fastapi import UploadFile
+from loguru import logger
+from PIL import Image
+
+from lnbits.core.crud.assets import create_asset, get_user_assets_count
+from lnbits.core.models.assets import Asset
+from lnbits.settings import settings
+
+
+async def create_user_asset(user_id: str, file: UploadFile, is_public: bool) -> Asset:
+    if not file.content_type:
+        raise ValueError("File must have a content type.")
+    if file.content_type.lower() not in settings.lnbits_assets_allowed_mime_types:
+        raise ValueError(f"File type '{file.content_type}' not allowed.")
+
+    if not settings.is_unlimited_assets_user(user_id):
+        user_assets_count = await get_user_assets_count(user_id)
+        if user_assets_count >= settings.lnbits_max_assets_per_user:
+            raise ValueError(
+                f"Max upload count of {settings.lnbits_max_assets_per_user} exceeded."
+            )
+
+    contents = await file.read()
+    if len(contents) > settings.lnbits_max_asset_size_mb * 1024 * 1024:
+        raise ValueError(
+            f"File limit of {settings.lnbits_max_asset_size_mb}MB exceeded."
+        )
+
+    thumb_buffer = thumbnail_from_bytes(contents)
+
+    asset = Asset(
+        id=uuid4().hex,
+        user_id=user_id,
+        mime_type=file.content_type,
+        is_public=is_public,
+        name=file.filename or "unnamed",
+        size_bytes=len(contents),
+        thumbnail_base64=(
+            base64.b64encode(thumb_buffer.getvalue()).decode("utf-8")
+            if thumb_buffer
+            else None
+        ),
+        data=contents,
+    )
+
+    await create_asset(asset)
+    return asset
+
+
+def thumbnail_from_bytes(contents: bytes) -> io.BytesIO | None:
+    try:
+        image = Image.open(io.BytesIO(contents))
+
+        thumbnail_width = min(256, settings.lnbits_asset_thumbnail_width)
+        thumbnail_height = min(256, settings.lnbits_asset_thumbnail_height)
+        image.thumbnail((thumbnail_width, thumbnail_height))
+
+        # Save thumbnail to an in-memory buffer
+        thumb_buffer = io.BytesIO()
+        thumbnail_format = settings.lnbits_asset_thumbnail_format or "PNG"
+        image.save(thumb_buffer, format=thumbnail_format)
+        thumb_buffer.seek(0)
+        return thumb_buffer
+    except Exception as exc:
+        logger.warning(f"Failed to create thumbnail: {exc}")
+        return None
@@ -10,12 +10,18 @@ from lnbits.core.crud import (
    get_db_version,
    get_installed_extension,
    update_installed_extension_state,
+    update_migration_version,
 )
 from lnbits.core.crud.extensions import (
    get_installed_extensions,
    update_installed_extension,
 )
 from lnbits.core.helpers import migrate_extension_database
+from lnbits.core.wasm.extension_host import (
+    clear_schedules_for_extension,
+    clear_tag_watches_for_extension,
+)
+from lnbits.db import COCKROACH, POSTGRES, Connection, Database
 from lnbits.settings import settings

 from ..models.extensions import Extension, ExtensionMeta, InstallableExtension
@@ -52,6 +58,9 @@ async def install_extension(
    else:
        await update_installed_extension(ext_info)

+    if ext_info.meta and ext_info.meta.extension_type == "wasm":
+        await update_migration_version(None, ext_info.id, 0)
+
    extension = Extension.from_installable_ext(ext_info)
    if extension.is_upgrade_extension:
        # call stop while the old routes are still active
@@ -69,10 +78,26 @@ async def uninstall_extension(ext_id: str):

    extension = await get_installed_extension(ext_id)
    if extension:
+        if extension.meta and extension.meta.extension_type == "wasm":
+            await clear_tag_watches_for_extension(ext_id)
+            await clear_schedules_for_extension(ext_id)
+            await _purge_wasm_extension_db(ext_id)
        extension.clean_extension_files()
    await delete_installed_extension(ext_id=ext_id)


+async def _purge_wasm_extension_db(ext_id: str) -> None:
+    cleaned = await Database.clean_ext_db_files(ext_id)
+    if cleaned:
+        return
+    try:
+        db = Database(f"ext_{ext_id}")
+        if db.type in {POSTGRES, COCKROACH}:
+            await db.execute(f"DROP SCHEMA IF EXISTS {ext_id} CASCADE")
+    except Exception as exc:
+        logger.warning(f"Failed to drop WASM extension schema for '{ext_id}': {exc}")
+
+
 async def activate_extension(ext: Extension):
    core_app_extra.register_new_ext_routes(ext)
    await update_installed_extension_state(ext_id=ext.code, active=True)
@@ -82,6 +107,10 @@ async def activate_extension(ext: Extension):
 async def deactivate_extension(ext_id: str):
    settings.deactivate_extension_paths(ext_id)
    await update_installed_extension_state(ext_id=ext_id, active=False)
+    extension = await get_installed_extension(ext_id)
+    if extension and extension.meta and extension.meta.extension_type == "wasm":
+        await clear_tag_watches_for_extension(ext_id)
+        await clear_schedules_for_extension(ext_id)
    await stop_extension_background_work(ext_id)


@@ -90,6 +119,9 @@ async def stop_extension_background_work(ext_id: str) -> bool:
    Stop background work for extension (like asyncio.Tasks, WebSockets, etc).
    Extension must expose a `myextension_stop()` function if it is starting tasks.
    """
+    installed = await get_installed_extension(ext_id)
+    if installed and installed.meta and installed.meta.extension_type == "wasm":
+        return True
    upgrade_hash = settings.extension_upgrade_hash(ext_id)
    ext = Extension(code=ext_id, is_valid=True, upgrade_hash=upgrade_hash)

@@ -122,6 +154,9 @@ async def start_extension_background_work(ext_id: str) -> bool:
    Extension CAN expose a `myextension_start()` function if it is starting tasks.
    Extension MUST expose a `myextension_stop()` in that case.
    """
+    installed = await get_installed_extension(ext_id)
+    if installed and installed.meta and installed.meta.extension_type == "wasm":
+        return True
    upgrade_hash = settings.extension_upgrade_hash(ext_id)
    ext = Extension(code=ext_id, is_valid=True, upgrade_hash=upgrade_hash)

@@ -149,9 +184,9 @@ async def start_extension_background_work(ext_id: str) -> bool:


 async def get_valid_extensions(
-    include_deactivated: bool | None = True,
+    include_deactivated: bool | None = True, conn: Connection | None = None
 ) -> list[Extension]:
-    installed_extensions = await get_installed_extensions()
+    installed_extensions = await get_installed_extensions(conn=conn)
    valid_extensions = [Extension.from_installable_ext(e) for e in installed_extensions]

    if include_deactivated:
@@ -20,6 +20,7 @@ from lnbits.helpers import (
    camel_to_words,
    download_url,
    lowercase_first_letter,
+    snake_to_camel,
 )
 from lnbits.settings import settings

@@ -195,13 +196,29 @@ def _copy_ext_stub_to_build_dir(
    ext_build_dir = Path(working_dir, new_ext_id, working_dir_name, new_ext_id)
    shutil.rmtree(ext_build_dir, True)

-    shutil.copytree(ext_stub_cache_dir, ext_build_dir)
+    shutil.copytree(
+        ext_stub_cache_dir,
+        ext_build_dir,
+        ignore=shutil.ignore_patterns(
+            "__pycache__",
+            ".git",
+            ".env",
+            ".venv",
+            "*.env",
+            "*.log",
+            "node_modules",
+            ".mypy_cache",
+            ".pytest_cache",
+            ".ruff_cache",
+        ),
+    )
    return ext_build_dir


 def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None:
    parsed_data = _parse_extension_data(data)
-    for py_file in py_files:
+    test_files = [f"tests/{p.name}" for p in Path(ext_stub_dir, "tests").glob("*.py")]
+    for py_file in py_files + test_files:
        template_path = Path(ext_stub_dir, py_file).as_posix()
        rederer = _render_file(template_path, parsed_data)
        with open(template_path, "w", encoding="utf-8") as f:
@@ -209,7 +226,7 @@ def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None

        _remove_lines_with_string(template_path, remove_line_marker)

-    template_path = Path(ext_stub_dir, "static", "js", "index.js").as_posix()
+    template_path = Path(ext_stub_dir, "static", "index.js").as_posix()
    rederer = _render_file(
        template_path, {"preview": data.preview_action, **parsed_data}
    )
@@ -234,9 +251,7 @@ def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None
        "settingsFormDialog.data",
        ext_stub_dir,
    )
-    template_path = Path(
-        ext_stub_dir, "templates", "extension_builder_stub", "index.html"
-    ).as_posix()
+    template_path = Path(ext_stub_dir, "static", "index.vue").as_posix()
    rederer = _render_file(
        template_path,
        {
@@ -263,12 +278,12 @@ def _replace_jinja_placeholders(data: ExtensionData, ext_stub_dir: Path) -> None
        "publicClientData",
        ext_stub_dir,
    )
-    public_template_path = Path(
-        ext_stub_dir, "templates", "extension_builder_stub", "public_page.html"
-    )
+    public_template_path = Path(ext_stub_dir, "static", "public_page.vue")
+    public_component_path = Path(ext_stub_dir, "static", "public_page.js")
    template_path = public_template_path.as_posix()
    if not data.public_page.has_public_page:
        public_template_path.unlink(missing_ok=True)
+        public_component_path.unlink(missing_ok=True)
    else:
        rederer = _render_file(
            template_path,
@@ -308,8 +323,10 @@ def zip_directory(source_dir, zip_path):

 def _rename_extension_builder_stub(data: ExtensionData, extension_dir: Path) -> None:
    extension_dir_path = extension_dir.as_posix()
+    # the order of fields is important, do not chage
    rename_values = {
        "extension_builder_stub_name": data.name,
+        "extension_builder_stub_camel_name": snake_to_camel(data.id, True),
        "extension_builder_stub_short_description": data.short_description or "",
        "extension_builder_stub": data.id,
        "OwnerData": data.owner_data.name,
@@ -328,7 +345,7 @@ def _rename_extension_builder_stub(data: ExtensionData, extension_dir: Path) ->
            directory=extension_dir_path,
            old_text=old_text,
            new_text=new_text,
-            file_extensions=[".py", ".js", ".html", ".md", ".json", ".toml"],
+            file_extensions=[".py", ".js", ".vue", ".html", ".md", ".json", ".toml"],
        )

    _rename_files_and_dirs_in_directory(
@@ -406,6 +423,7 @@ def _parse_extension_data(data: ExtensionData) -> dict:
        "owner_data": {
            "name": data.owner_data.name,
            "editable": data.owner_data.editable,
+            "fields": [field.name for field in data.owner_data.fields],
            "js_fields": [
                field.field_to_js()
                for field in data.owner_data.fields
@@ -432,6 +450,18 @@ def _parse_extension_data(data: ExtensionData) -> dict:
            ],
            "db_fields": [field.field_to_db() for field in data.owner_data.fields],
            "all_fields": [field.field_to_py() for field in data.owner_data.fields],
+            "random_fields_values": [
+                field.field_to_random_value() for field in data.owner_data.fields
+            ],
+            "public_fields": [
+                field.field_to_py()
+                for field in data.owner_data.fields
+                if field.name
+                in [
+                    data.public_page.owner_data_fields.name,
+                    data.public_page.owner_data_fields.description,
+                ]
+            ],
        },
        "client_data": {
            "name": data.client_data.name,
@@ -457,6 +487,9 @@ def _parse_extension_data(data: ExtensionData) -> dict:
            ],
            "db_fields": [field.field_to_db() for field in data.client_data.fields],
            "all_fields": [field.field_to_py() for field in data.client_data.fields],
+            "random_fields_values": [
+                field.field_to_random_value() for field in data.client_data.fields
+            ],
        },
        "settings_data": {
            "enabled": data.settings_data.enabled,
@@ -536,7 +569,7 @@ def _rename_files_and_dirs_in_directory(directory, old_text, new_text):
                    logger.warning(f"Failed to rename directory {old_dir_path}: {e}")


-def _is_excluded_dir(path):
+def _is_excluded_dir(path: str) -> bool:
    for excluded_dir in excluded_dirs:
        if path.startswith(excluded_dir):
            return True
@@ -1,7 +1,9 @@
 import hashlib
 import hmac
+import json
 import time

+import httpx
 from loguru import logger

 from lnbits.core.crud import get_wallet
@@ -10,6 +12,12 @@ from lnbits.core.models import CreatePayment, Payment, PaymentState
 from lnbits.core.models.misc import SimpleStatus
 from lnbits.db import Connection
 from lnbits.fiat import get_fiat_provider
+from lnbits.fiat.base import (
+    FiatPaymentFailedStatus,
+    FiatPaymentPendingStatus,
+    FiatPaymentStatus,
+    FiatPaymentSuccessStatus,
+)
 from lnbits.settings import settings


@@ -27,6 +35,40 @@ async def handle_fiat_payment_confirmation(
        logger.warning(e)


+async def check_fiat_status(
+    payment: Payment, skip_internal_payment_notifications: bool | None = False
+) -> FiatPaymentStatus:
+    if not payment.is_internal:
+        return FiatPaymentPendingStatus()
+    if payment.success:
+        return FiatPaymentSuccessStatus()
+    if payment.failed:
+        return FiatPaymentFailedStatus()
+
+    if not payment.fiat_provider:
+        return FiatPaymentPendingStatus()
+
+    checking_id = payment.extra.get("fiat_checking_id")
+    if not checking_id:
+        return FiatPaymentPendingStatus()
+
+    fiat_provider = await get_fiat_provider(payment.fiat_provider)
+    if not fiat_provider:
+        return FiatPaymentPendingStatus()
+    fiat_status = await fiat_provider.get_invoice_status(checking_id)
+
+    if skip_internal_payment_notifications:
+        return fiat_status
+
+    if fiat_status.success:
+        # notify receivers asynchronously
+        from lnbits.tasks import internal_invoice_queue
+
+        await internal_invoice_queue.put(payment.checking_id)
+
+    return fiat_status
+
+
 def check_stripe_signature(
    payload: bytes,
    sig_header: str | None,
@@ -70,6 +112,63 @@ def check_stripe_signature(
        raise ValueError("Stripe signature verification failed.")


+async def verify_paypal_webhook(headers, payload: bytes):
+    """
+    Validate PayPal webhook signatures using the PayPal verify API.
+    """
+    webhook_id = settings.paypal_webhook_id
+    if not webhook_id:
+        logger.warning("PayPal webhook ID not set.")
+        raise ValueError("PayPal webhook cannot be verified. Missing webhook ID.")
+
+    required_headers = {
+        "PAYPAL-TRANSMISSION-ID": headers.get("PAYPAL-TRANSMISSION-ID"),
+        "PAYPAL-TRANSMISSION-TIME": headers.get("PAYPAL-TRANSMISSION-TIME"),
+        "PAYPAL-TRANSMISSION-SIG": headers.get("PAYPAL-TRANSMISSION-SIG"),
+        "PAYPAL-CERT-URL": headers.get("PAYPAL-CERT-URL"),
+        "PAYPAL-AUTH-ALGO": headers.get("PAYPAL-AUTH-ALGO"),
+    }
+    if not all(required_headers.values()):
+        logger.warning("Missing PayPal webhook headers.")
+        raise ValueError("PayPal webhook cannot be verified. Missing headers.")
+
+    try:
+        async with httpx.AsyncClient(base_url=settings.paypal_api_endpoint) as client:
+            token_resp = await client.post(
+                "/v1/oauth2/token",
+                data={"grant_type": "client_credentials"},
+                auth=(
+                    settings.paypal_client_id or "",
+                    settings.paypal_client_secret or "",
+                ),
+            )
+            token_resp.raise_for_status()
+            access_token = token_resp.json().get("access_token")
+            if not access_token:
+                raise ValueError("PayPal token missing in verification flow.")
+
+            verify_resp = await client.post(
+                "/v1/notifications/verify-webhook-signature",
+                json={
+                    "auth_algo": required_headers["PAYPAL-AUTH-ALGO"],
+                    "cert_url": required_headers["PAYPAL-CERT-URL"],
+                    "transmission_id": required_headers["PAYPAL-TRANSMISSION-ID"],
+                    "transmission_sig": required_headers["PAYPAL-TRANSMISSION-SIG"],
+                    "transmission_time": required_headers["PAYPAL-TRANSMISSION-TIME"],
+                    "webhook_id": webhook_id,
+                    "webhook_event": json.loads(payload.decode()),
+                },
+                headers={"Authorization": f"Bearer {access_token}"},
+            )
+            verify_resp.raise_for_status()
+            verification_status = verify_resp.json().get("verification_status")
+            if verification_status != "SUCCESS":
+                raise ValueError("PayPal webhook verification failed.")
+    except Exception as exc:
+        logger.warning(exc)
+        raise ValueError("PayPal webhook cannot be verified.") from exc
+
+
 async def test_connection(provider: str) -> SimpleStatus:
    """
    Test the connection to Stripe by checking if the API key is valid.
@@ -70,7 +70,8 @@ async def check_balance_delta_changed():
    if settings.latest_balance_delta_sats is None:
        settings.latest_balance_delta_sats = status.delta_sats
        return
-    if status.delta_sats != settings.latest_balance_delta_sats:
+    delta_change = abs(status.delta_sats - settings.latest_balance_delta_sats)
+    if delta_change >= settings.notification_balance_delta_threshold_sats:
        enqueue_admin_notification(
            NotificationType.balance_delta,
            {
@@ -1,6 +1,7 @@
 import asyncio
 import json
 import smtplib
+from asyncio.tasks import create_task
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from http import HTTPStatus
@@ -16,6 +17,7 @@ from lnbits.core.crud import (
    mark_webhook_sent,
 )
 from lnbits.core.crud.users import get_user
+from lnbits.core.crud.wallets import get_wallet
 from lnbits.core.models import Payment, Wallet
 from lnbits.core.models.notifications import (
    NOTIFICATION_TEMPLATES,
@@ -240,6 +242,10 @@ async def dispatch_webhook(payment: Payment):
    async with httpx.AsyncClient(headers=headers) as client:
        try:
            check_callback_url(payment.webhook)
+        except ValueError as exc:
+            await mark_webhook_sent(payment.payment_hash, "-1")
+            logger.warning(f"Invalid webhook URL {payment.webhook}: {exc!s}")
+        try:
            r = await client.post(payment.webhook, json=payment.json(), timeout=40)
            r.raise_for_status()
            await mark_webhook_sent(payment.payment_hash, str(r.status_code))
@@ -257,6 +263,12 @@ async def dispatch_webhook(payment: Payment):
 async def send_payment_notification(wallet: Wallet, payment: Payment):
    try:
        await send_ws_payment_notification(wallet, payment)
+        for shared in wallet.extra.shared_with:
+            if not shared.shared_with_wallet_id:
+                continue
+            shared_wallet = await get_wallet(shared.shared_with_wallet_id)
+            if shared_wallet and shared_wallet.can_view_payments:
+                await send_ws_payment_notification(shared_wallet, payment)
    except Exception as e:
        logger.error(f"Error sending websocket payment notification {e!s}")
    try:
@@ -275,6 +287,13 @@ async def send_payment_notification(wallet: Wallet, payment: Payment):
        logger.error(f"Error dispatching webhook: {e!s}")


+def send_payment_notification_in_background(wallet: Wallet, payment: Payment):
+    try:
+        create_task(send_payment_notification(wallet, payment))
+    except Exception as e:
+        logger.warning(f"Error sending payment notification: {e}")
+
+
 async def send_ws_payment_notification(wallet: Wallet, payment: Payment):
    # TODO: websocket message should be a clean payment model
    # await websocket_manager.send(wallet.inkey, payment.json())
@@ -294,6 +313,11 @@ async def send_ws_payment_notification(wallet: Wallet, payment: Payment):
        payment.payment_hash,
        json.dumps({"pending": payment.pending, "status": payment.status}),
    )
+    if payment.tag and not payment.is_out:
+        await websocket_manager.send(
+            f"tag:{wallet.id}:{payment.tag}",
+            payment.json(),
+        )


 async def send_chat_payment_notification(wallet: Wallet, payment: Payment):
@@ -381,7 +405,7 @@ def _is_message_type_enabled(message_type: NotificationType) -> bool:
    if message_type == NotificationType.watchdog_check:
        return settings.lnbits_notification_watchdog
    if message_type == NotificationType.balance_delta:
-        return settings.notification_balance_delta_changed
+        return settings.notification_balance_delta_threshold_sats > 0
    if message_type == NotificationType.server_start_stop:
        return settings.lnbits_notification_server_start_stop
    if message_type == NotificationType.server_status:
@@ -25,6 +25,7 @@ from lnbits.utils.exchange_rates import fiat_amount_as_satoshis, satoshis_amount
 from lnbits.wallets import fake_wallet, get_funding_source
 from lnbits.wallets.base import (
    InvoiceResponse,
+    PaymentFailedStatus,
    PaymentPendingStatus,
    PaymentResponse,
    PaymentStatus,
@@ -47,7 +48,8 @@ from ..models import (
    PaymentState,
    Wallet,
 )
-from .notifications import send_payment_notification
+from .fiat_providers import check_fiat_status
+from .notifications import send_payment_notification_in_background

 payment_lock = asyncio.Lock()
 wallets_payments_lock: dict[str, asyncio.Lock] = {}
@@ -61,11 +63,13 @@ async def pay_invoice(
    extra: dict | None = None,
    description: str = "",
    tag: str = "",
+    labels: list[str] | None = None,
    conn: Connection | None = None,
 ) -> Payment:
    if settings.lnbits_only_allow_incoming_payments:
        raise PaymentError("Only incoming payments allowed.", status="failed")
    invoice = _validate_payment_request(payment_request, max_sat)
+
    if not invoice.amount_msat:
        raise ValueError("Missig invoice amount.")

@@ -73,25 +77,34 @@ async def pay_invoice(
        amount_msat = invoice.amount_msat
        wallet = await _check_wallet_for_payment(wallet_id, tag, amount_msat, new_conn)

+        if not wallet.can_send_payments:
+            raise PaymentError(
+                "Wallet does not have permission to pay invoices.",
+                status="failed",
+            )
+
        if await is_internal_status_success(invoice.payment_hash, new_conn):
            raise PaymentError("Internal invoice already paid.", status="failed")

        _, extra = await calculate_fiat_amounts(amount_msat / 1000, wallet, extra=extra)

        create_payment_model = CreatePayment(
-            wallet_id=wallet_id,
+            wallet_id=wallet.source_wallet_id,
            bolt11=payment_request,
            payment_hash=invoice.payment_hash,
            amount_msat=-amount_msat,
            expiry=invoice.expiry_date,
            memo=description or invoice.description or "",
            extra=extra,
+            labels=labels,
        )

-    payment = await _pay_invoice(wallet.id, create_payment_model, conn)
-
    async with db.reuse_conn(conn) if conn else db.connect() as new_conn:
-        await _credit_service_fee_wallet(wallet, payment, new_conn)
+        payment = await _pay_invoice(
+            wallet.source_wallet_id, create_payment_model, conn=new_conn
+        )
+
+        await _credit_service_fee_wallet(wallet, payment, conn=new_conn)

    return payment

@@ -190,19 +203,22 @@ async def create_wallet_invoice(wallet_id: str, data: CreateInvoice) -> Payment:
        # do not save memo if description_hash or unhashed_description is set
        memo = ""

-    payment = 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,
-        payment_hash=data.payment_hash,
-    )
+    async with db.connect() as conn:
+        payment = 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,
+            payment_hash=data.payment_hash,
+            labels=data.labels,
+            conn=conn,
+        )

    if data.lnurl_withdraw:
        try:
@@ -241,6 +257,7 @@ async def create_invoice(
    webhook: str | None = None,
    internal: bool | None = False,
    payment_hash: str | None = None,
+    labels: list[str] | None = None,
    conn: Connection | None = None,
 ) -> Payment:
    if not amount > 0:
@@ -250,6 +267,12 @@ async def create_invoice(
    if not user_wallet:
        raise InvoiceError(f"Could not fetch wallet '{wallet_id}'.", status="failed")

+    if not user_wallet.can_receive_payments:
+        raise InvoiceError(
+            "Wallet does not have permission to create invoices.",
+            status="failed",
+        )
+
    invoice_memo = None if description_hash else memo[:640]

    # use the fake wallet if the invoice is for internal use only
@@ -308,7 +331,7 @@ async def create_invoice(
    invoice = bolt11_decode(invoice_response.payment_request)

    create_payment_model = CreatePayment(
-        wallet_id=wallet_id,
+        wallet_id=user_wallet.source_wallet_id,
        bolt11=invoice_response.payment_request,
        payment_hash=invoice.payment_hash,
        preimage=invoice_response.preimage,
@@ -318,6 +341,7 @@ async def create_invoice(
        extra=extra,
        webhook=webhook,
        fee=invoice_response.fee_msat or 0,
+        labels=labels,
    )

    payment = await create_payment(
@@ -339,13 +363,15 @@ async def update_pending_payments(wallet_id: str):
        await update_pending_payment(payment)


-async def update_pending_payment(payment: Payment) -> Payment:
-    status = await payment.check_status()
+async def update_pending_payment(
+    payment: Payment, conn: Connection | None = None
+) -> Payment:
+    status = await check_payment_status(payment)
    if status.failed:
        payment.status = PaymentState.FAILED
-        await update_payment(payment)
+        await update_payment(payment, conn=conn)
    elif status.success:
-        payment = await update_payment_success_status(payment, status)
+        payment = await update_payment_success_status(payment, status, conn=conn)
    return payment


@@ -456,7 +482,7 @@ async def update_wallet_balance(
            await create_payment(
                checking_id=f"internal_{payment_hash}",
                data=CreatePayment(
-                    wallet_id=wallet.id,
+                    wallet_id=wallet.source_wallet_id,
                    bolt11=bolt11,
                    payment_hash=payment_hash,
                    amount_msat=amount * 1000,
@@ -475,7 +501,7 @@ async def update_wallet_balance(
        raise ValueError("Balance change failed, amount exceeds maximum balance.")
    async with db.reuse_conn(conn) if conn else db.connect() as conn:
        payment = await create_invoice(
-            wallet_id=wallet.id,
+            wallet_id=wallet.source_wallet_id,
            amount=amount,
            memo="Admin credit",
            internal=True,
@@ -594,7 +620,29 @@ async def check_transaction_status(
    if payment.status == PaymentState.SUCCESS.value:
        return PaymentSuccessStatus(fee_msat=payment.fee)

-    return await payment.check_status()
+    return await check_payment_status(payment)
+
+
+async def check_payment_status(
+    payment: Payment, skip_internal_payment_notifications: bool | None = False
+) -> PaymentStatus:
+    if payment.is_internal:
+        if payment.success:
+            return PaymentSuccessStatus()
+        if payment.failed:
+            return PaymentFailedStatus()
+        if payment.is_in and payment.fiat_provider:
+            fiat_status = await check_fiat_status(
+                payment, skip_internal_payment_notifications
+            )
+            return PaymentStatus(paid=fiat_status.paid)
+        return PaymentPendingStatus()
+    funding_source = get_funding_source()
+    if payment.is_out:
+        status = await funding_source.get_payment_status(payment.checking_id)
+    else:
+        status = await funding_source.get_invoice_status(payment.checking_id)
+    return status


 async def get_payments_daily_stats(
@@ -682,6 +730,7 @@ async def _pay_internal_invoice(
    internal_payment = await check_internal(
        create_payment_model.payment_hash, conn=conn
    )
+
    if not internal_payment:
        return None

@@ -690,6 +739,7 @@ async def _pay_internal_invoice(
    internal_invoice = await get_standalone_payment(
        internal_payment.checking_id, incoming=True, conn=conn
    )
+
    if not internal_invoice:
        raise PaymentError("Internal payment not found.", status="failed")

@@ -711,6 +761,7 @@ async def _pay_internal_invoice(

    internal_id = f"internal_{create_payment_model.payment_hash}"
    logger.debug(f"creating temporary internal payment with id {internal_id}")
+
    payment = await create_payment(
        checking_id=internal_id,
        data=create_payment_model,
@@ -725,7 +776,7 @@ async def _pay_internal_invoice(
    await update_payment(internal_payment, conn=conn)
    logger.success(f"internal payment successful {internal_payment.checking_id}")

-    await send_payment_notification(wallet, payment)
+    await _send_payment_notification_in_background(wallet.id, payment, conn=conn)

    # notify receiver asynchronously
    from lnbits.tasks import internal_invoice_queue
@@ -798,7 +849,8 @@ async def _pay_external_invoice(
        payment = await update_payment_success_status(
            payment, payment_response, conn=conn
        )
-        await send_payment_notification(wallet, payment)
+
+        await _send_payment_notification_in_background(wallet.id, payment, conn=conn)
        logger.success(f"payment successful {payment_response.checking_id}")

    payment.checking_id = payment_response.checking_id
@@ -841,7 +893,7 @@ async def _verify_external_payment(
        raise PaymentError("Payment already paid.", status="success")

    # payment failed
-    status = await payment.check_status()
+    status = await check_payment_status(payment)
    if status.failed:
        raise PaymentError(
            "Payment is failed node, retrying is not possible.", status="failed"
@@ -910,7 +962,7 @@ async def _credit_service_fee_wallet(

    memo = f"""
        Service fee for payment of {abs(payment.sat)} sats.
-        Wallet: '{wallet.name}' ({wallet.id})."""
+        Wallet: '{wallet.name}' ({wallet.source_wallet_id})."""

    create_payment_model = CreatePayment(
        wallet_id=settings.lnbits_service_fee_wallet,
@@ -1006,3 +1058,13 @@ async def cancel_hold_invoice(payment: Payment) -> InvoiceResponse:
    await update_payment(payment)

    return response
+
+
+async def _send_payment_notification_in_background(
+    wallet_id: str, payment: Payment, conn: Connection | None = None
+):
+    # fetch balance again
+    wallet = await get_wallet(wallet_id, conn=conn)
+    if not wallet:
+        raise PaymentError(f"Could not fetch wallet '{wallet_id}'.", status="failed")
+    send_payment_notification_in_background(wallet, payment)
@@ -3,7 +3,11 @@ from uuid import uuid4

 from loguru import logger

+from lnbits.core.crud.settings import set_settings_field
+from lnbits.core.db import db
 from lnbits.core.models.extensions import UserExtension
+from lnbits.core.models.users import RegisterUser
+from lnbits.db import Connection
 from lnbits.settings import (
    EditableSettings,
    SuperSettings,
@@ -48,37 +52,43 @@ async def create_user_account_no_ckeck(
    account: Account | None = None,
    wallet_name: str | None = None,
    default_exts: list[str] | None = None,
+    conn: Connection | None = None,
 ) -> User:
+    async with db.reuse_conn(conn) if conn else db.connect() as conn:
+        if account:
+            account.validate_fields()
+            if account.username and await get_account_by_username(
+                account.username, conn=conn
+            ):
+                raise ValueError("Username already exists.")

-    if account:
-        account.validate_fields()
-        if account.username and await get_account_by_username(account.username):
-            raise ValueError("Username already exists.")
+            if account.email and await get_account_by_email(account.email, conn=conn):
+                raise ValueError("Email already exists.")

-        if account.email and await get_account_by_email(account.email):
-            raise ValueError("Email already exists.")
+            if account.pubkey and await get_account_by_pubkey(
+                account.pubkey, conn=conn
+            ):
+                raise ValueError("Pubkey already exists.")

-        if account.pubkey and await get_account_by_pubkey(account.pubkey):
-            raise ValueError("Pubkey already exists.")
+            if not account.id:
+                account.id = uuid4().hex

-        if not account.id:
-            account.id = uuid4().hex
+        account = await create_account(account, conn=conn)
+        await create_wallet(
+            user_id=account.id,
+            wallet_name=wallet_name or settings.lnbits_default_wallet_name,
+            conn=conn,
+        )

-    account = await create_account(account)
-    await create_wallet(
-        user_id=account.id,
-        wallet_name=wallet_name or settings.lnbits_default_wallet_name,
-    )
+        user_extensions = (default_exts or []) + settings.lnbits_user_default_extensions
+        for ext_id in user_extensions:
+            try:
+                user_ext = UserExtension(user=account.id, extension=ext_id, active=True)
+                await create_user_extension(user_ext, conn=conn)
+            except Exception as e:
+                logger.error(f"Error enabeling default extension {ext_id}: {e}")

-    user_extensions = (default_exts or []) + settings.lnbits_user_default_extensions
-    for ext_id in user_extensions:
-        try:
-            user_ext = UserExtension(user=account.id, extension=ext_id, active=True)
-            await create_user_extension(user_ext)
-        except Exception as e:
-            logger.error(f"Error enabeling default extension {ext_id}: {e}")
-
-    user = await get_user_from_account(account)
+        user = await get_user_from_account(account, conn=conn)
    if not user:
        raise ValueError("Cannot find user for account.")

@@ -184,3 +194,25 @@ async def init_admin_settings(super_user: str | None = None) -> SuperSettings:

    editable_settings = EditableSettings.from_dict(settings.dict())
    return await create_admin_settings(account.id, editable_settings.dict())
+
+
+async def check_register_activation_settings(data: RegisterUser):
+    if not settings.lnbits_require_user_activation:
+        return None
+    if settings.lnbits_user_activation_by_invitation_code:
+        code = data.invitation_code.strip() if data.invitation_code else ""
+        if len(code) == 0:
+            raise ValueError("Invitation code cannot be empty.")
+
+        if code == settings.lnbits_register_reusable_activation_code:
+            return None
+        if code in settings.lnbits_register_one_time_activation_codes:
+            settings.lnbits_register_one_time_activation_codes.remove(code)
+            await set_settings_field(
+                "lnbits_register_one_time_activation_codes",
+                settings.lnbits_register_one_time_activation_codes,
+            )
+            return None
+        raise ValueError("Invalid invitation code.")
+
+    raise ValueError("No activation method provided.")
@@ -0,0 +1,202 @@
+from lnbits.core.crud.users import (
+    get_account,
+    get_account_by_username_or_email,
+    update_account,
+)
+from lnbits.core.crud.wallets import (
+    create_wallet,
+    force_delete_wallet,
+    get_standalone_wallet,
+    get_wallet,
+    get_wallets,
+    update_wallet,
+)
+from lnbits.core.models.misc import SimpleStatus
+from lnbits.core.models.users import Account
+from lnbits.core.models.wallets import (
+    Wallet,
+    WalletSharePermission,
+    WalletShareStatus,
+    WalletType,
+)
+from lnbits.db import Connection
+from lnbits.helpers import sha256s
+
+
+async def invite_to_wallet(
+    source_wallet: Wallet, data: WalletSharePermission
+) -> WalletSharePermission:
+    if not source_wallet.is_lightning_wallet:
+        raise ValueError("Only lightning wallets can be shared.")
+    if not data.username:
+        raise ValueError("Username or email missing.")
+    invited_user = await get_account_by_username_or_email(data.username)
+    if not invited_user:
+        raise ValueError("Invited user not found.")
+
+    request_id = sha256s(invited_user.id + source_wallet.id)
+    share = source_wallet.extra.find_share_by_id(request_id)
+    if share:
+        raise ValueError("User already invited to this wallet.")
+
+    invite_request = source_wallet.extra.invite_user_to_shared_wallet(
+        request_id=request_id,
+        request_type=WalletShareStatus.INVITE_SENT,
+        username=data.username,
+        permissions=data.permissions,
+    )
+    await update_wallet(source_wallet)
+
+    wallet_owner = await get_account(source_wallet.user)
+    if not wallet_owner:
+        raise ValueError("Cannot find wallet owner.")
+    invited_user.extra.add_wallet_invite_request(
+        request_id=request_id,
+        from_user_name=wallet_owner.username or wallet_owner.email,
+        to_wallet_id=source_wallet.id,
+        to_wallet_name=source_wallet.name,
+    )
+    await update_account(invited_user)
+
+    return invite_request
+
+
+async def reject_wallet_invitation(invited_user_id: str, share_request_id: str):
+    invited_user = await get_account(invited_user_id)
+    if not invited_user:
+        raise ValueError("Invited user not found.")
+
+    existing_request = invited_user.extra.find_wallet_invite_request(share_request_id)
+    if not existing_request:
+        raise ValueError("Invitation not found.")
+
+    invited_user.extra.remove_wallet_invite_request(share_request_id)
+    await update_account(invited_user)
+
+
+async def update_wallet_share_permissions(
+    source_wallet: Wallet, data: WalletSharePermission
+) -> WalletSharePermission:
+    if not source_wallet.is_lightning_wallet:
+        raise ValueError("Only lightning wallets can be shared.")
+    if not data.shared_with_wallet_id:
+        raise ValueError("Wallet ID missing.")
+
+    share = source_wallet.extra.find_share_for_wallet(data.shared_with_wallet_id)
+    if not share:
+        raise ValueError("Share not found")
+
+    if not share.shared_with_wallet_id:
+        raise ValueError("Share does not have a mirror wallet ID.")
+
+    mirror_wallet = await get_wallet(share.shared_with_wallet_id)
+    if not mirror_wallet:
+        raise ValueError("Target wallet not found")
+    if not mirror_wallet.is_lightning_shared_wallet:
+        raise ValueError("Target wallet is not a shared wallet.")
+    if mirror_wallet.shared_wallet_id != source_wallet.id:
+        raise ValueError("Not the owner of the shared wallet.")
+
+    share.approve(permissions=data.permissions)
+    await update_wallet(source_wallet)
+    return share
+
+
+async def delete_wallet_share(source_wallet: Wallet, request_id: str) -> SimpleStatus:
+    if not source_wallet.is_lightning_wallet:
+        raise ValueError("Source wallet is not a lightning wallet.")
+
+    share = source_wallet.extra.find_share_by_id(request_id)
+    if not share:
+        raise ValueError("Wallet share not found.")
+    source_wallet.extra.remove_share_by_id(request_id)
+
+    invited_user = await get_account_by_username_or_email(share.username)
+    if not invited_user:
+        await update_wallet(source_wallet)
+        return SimpleStatus(
+            success=True, message="Permission removed. Invited user not found."
+        )
+    if invited_user.extra.find_wallet_invite_request(request_id):
+        invited_user.extra.remove_wallet_invite_request(request_id)
+        await update_account(invited_user)
+
+    mirror_wallets = await get_wallets(
+        invited_user.id, wallet_type=WalletType.LIGHTNING_SHARED
+    )
+    mirror_wallet = next(
+        (w for w in mirror_wallets if w.shared_wallet_id == source_wallet.id), None
+    )
+
+    if not mirror_wallet:
+        await update_wallet(source_wallet)
+        return SimpleStatus(
+            success=True, message="Permission removed. Target wallet not found."
+        )
+
+    if not mirror_wallet.is_lightning_shared_wallet:
+        raise ValueError("Target wallet is not a shared lightning wallet.")
+
+    if mirror_wallet.shared_wallet_id != source_wallet.id:
+        raise ValueError("Not the owner of the shared wallet.")
+
+    await force_delete_wallet(mirror_wallet.id)
+
+    await update_wallet(source_wallet)
+    return SimpleStatus(success=True, message="Permission removed.")
+
+
+async def create_lightning_shared_wallet(
+    user_id: str,
+    source_wallet_id: str,
+    conn: Connection | None = None,
+) -> Wallet:
+    source_wallet = await get_standalone_wallet(source_wallet_id, conn=conn)
+    if not source_wallet:
+        raise ValueError("Shared wallet does not exist.")
+
+    if not source_wallet.is_lightning_wallet:
+        raise ValueError("Shared wallet is not a lightning wallet.")
+
+    if source_wallet.user == user_id:
+        raise ValueError("Cannot mirror your own wallet.")
+
+    invited_user = await get_account(user_id, conn=conn)
+    if not invited_user:
+        raise ValueError("Cannot find invited user.")
+
+    return await _accept_invitation_to_shared_wallet(
+        invited_user, source_wallet, conn=conn
+    )
+
+
+async def _accept_invitation_to_shared_wallet(
+    invited_user: Account,
+    source_wallet: Wallet,
+    conn: Connection | None = None,
+) -> Wallet:
+    request_id = sha256s(invited_user.id + source_wallet.id)
+    existing_request = source_wallet.extra.find_share_by_id(request_id)
+    if not existing_request:
+        raise ValueError("No invitation found for this invited user.")
+    if existing_request.status == WalletShareStatus.APPROVED:
+        raise ValueError("This wallet is already shared with you.")
+    if existing_request.status != WalletShareStatus.INVITE_SENT:
+        raise ValueError("Unknown request type.")
+
+    invited_user.extra.remove_wallet_invite_request(request_id)
+    await update_account(invited_user)
+
+    # todo: double check if user already has a mirror wallet for this source wallet
+
+    mirror_wallet = await create_wallet(
+        user_id=invited_user.id,
+        wallet_name=source_wallet.name,
+        wallet_type=WalletType.LIGHTNING_SHARED,
+        shared_wallet_id=source_wallet.id,
+        conn=conn,
+    )
+    existing_request.approve(shared_with_wallet_id=mirror_wallet.id)
+    await update_wallet(source_wallet, conn=conn)
+    mirror_wallet.mirror_shared_wallet(source_wallet)
+    return mirror_wallet
@@ -35,7 +35,7 @@ async def run_by_the_minute_tasks() -> None:
    while settings.lnbits_running:
        status_minutes = settings.lnbits_notification_server_status_hours * 60

-        if settings.notification_balance_delta_changed:
+        if settings.notification_balance_delta_threshold_sats > 0:
            try:
                # runs by default every minute, the delta should not change that often
                await check_balance_delta_changed()
@@ -57,7 +57,9 @@ async def run_by_the_minute_tasks() -> None:
        if minute_counter % 60 == 0:
            try:
                # initialize the list of all extensions
-                await InstallableExtension.get_installable_extensions()
+                await InstallableExtension.get_installable_extensions(
+                    post_refresh_cache=True
+                )
            except Exception as ex:
                logger.error(ex)

@@ -1,287 +0,0 @@
-<q-tab-panel name="fiat_providers">
-  <h6 class="q-my-none q-mb-sm">
-    <span v-text="$t('fiat_providers')"></span>
-    <q-btn
-      round
-      flat
-      @click="hideInputsToggle()"
-      :icon="hideInputToggle ? 'visibility_off' : 'visibility'"
-    ></q-btn>
-  </h6>
-
-  <div class="row">
-    <div class="col">
-      <q-list bordered class="rounded-borders">
-        <q-expansion-item header-class="text-primary text-bold">
-          <template v-slot:header>
-            <q-item-section avatar>
-              <q-avatar>
-                <img
-                  :src="'{{ static_url_for('static', 'images/stripe_logo.ico') }}'"
-                />
-              </q-avatar>
-            </q-item-section>
-
-            <q-item-section> Stripe </q-item-section>
-
-            <q-item-section side>
-              <div class="row items-center">
-                <q-toggle
-                  size="md"
-                  :label="$t('enabled')"
-                  v-model="formData.stripe_enabled"
-                  color="green"
-                  unchecked-icon="clear"
-                />
-              </div>
-            </q-item-section>
-          </template>
-
-          <q-card class="q-pb-xl">
-            <q-expansion-item :label="$t('api')" default-opened>
-              <q-card-section class="q-pa-md">
-                <q-input
-                  filled
-                  type="text"
-                  v-model="formData.stripe_api_endpoint"
-                  :label="$t('endpoint')"
-                ></q-input>
-                <q-input
-                  filled
-                  class="q-mt-md"
-                  :type="hideInputToggle ? 'password' : 'text'"
-                  v-model="formData.stripe_api_secret_key"
-                  :label="$t('secret_key')"
-                ></q-input>
-                <q-input
-                  filled
-                  class="q-mt-md"
-                  type="text"
-                  v-model="formData.stripe_payment_success_url"
-                  :label="$t('callback_success_url')"
-                  :hint="$t('callback_success_url_hint')"
-                ></q-input>
-              </q-card-section>
-              <q-card-section class="q-pa-md">
-                <div class="row">
-                  <div class="col">
-                    <q-btn
-                      outline
-                      color="grey"
-                      class="float-right"
-                      :label="$t('check_connection')"
-                      @click="checkFiatProvider('stripe')"
-                    ></q-btn>
-                  </div>
-                </div>
-              </q-card-section>
-            </q-expansion-item>
-
-            <q-expansion-item :label="$t('webhook')" default-opened>
-              <q-card-section>
-                <span v-text="$t('webhook_stripe_description')"></span>
-              </q-card-section>
-              <q-card-section>
-                <q-input
-                  filled
-                  class="q-mt-md"
-                  type="text"
-                  disable
-                  v-model="formData.stripe_payment_webhook_url"
-                  :label="$t('webhook_url')"
-                  :hint="$t('webhook_url_hint')"
-                ></q-input>
-                <q-input
-                  filled
-                  class="q-mt-md"
-                  :type="hideInputToggle ? 'password' : 'text'"
-                  v-model="formData.stripe_webhook_signing_secret"
-                  :label="$t('signing_secret')"
-                  :hint="$t('signing_secret_hint')"
-                ></q-input>
-              </q-card-section>
-              <q-card-section>
-                <span v-text="$t('webhook_events_list')"></span>
-                <ul>
-                  <li><code>checkout.session.completed</code></li>
-                  - the user completed the checkout process
-                  <li><code>invoice.paid</code></li>
-                  - the invoice was successfully paid (for subscriptions)
-                </ul>
-              </q-card-section>
-            </q-expansion-item>
-            <q-expansion-item :label="$t('service_fee')">
-              <q-card-section>
-                <div class="row">
-                  <div class="col-md-4 col-sm-12">
-                    <q-input
-                      filled
-                      class="q-ma-sm"
-                      type="number"
-                      min="0"
-                      v-model="formData.stripe_limits.service_fee_percent"
-                      @update:model-value="touchSettings()"
-                      :label="$t('service_fee_label')"
-                      :hint="$t('service_fee_hint')"
-                    ></q-input>
-                  </div>
-                  <div class="col-md-4 col-sm-12">
-                    <q-input
-                      filled
-                      class="q-ma-sm"
-                      type="number"
-                      min="0"
-                      v-model="formData.stripe_limits.service_max_fee_sats"
-                      @update:model-value="touchSettings()"
-                      :label="$t('service_fee_max')"
-                      :hint="$t('service_fee_max_hint')"
-                    ></q-input>
-                  </div>
-                  <div class="col-md-4 col-sm-12">
-                    <q-input
-                      filled
-                      class="q-ma-sm"
-                      type="text"
-                      v-model="formData.stripe_limits.service_fee_wallet_id"
-                      @update:model-value="touchSettings()"
-                      :label="$t('fee_wallet_label')"
-                      :hint="$t('fee_wallet_hint')"
-                    ></q-input>
-                  </div>
-                </div>
-              </q-card-section>
-            </q-expansion-item>
-            <q-expansion-item :label="$t('amount_limits')">
-              <q-card-section>
-                <div class="row">
-                  <div class="col-md-4 col-sm-12">
-                    <q-input
-                      filled
-                      class="q-ma-sm"
-                      type="number"
-                      min="0"
-                      v-model="formData.stripe_limits.service_min_amount_sats"
-                      @update:model-value="touchSettings()"
-                      :label="$t('min_incoming_payment_amount')"
-                      :hint="$t('min_incoming_payment_amount_desc')"
-                    ></q-input>
-                  </div>
-                  <div class="col-md-4 col-sm-12">
-                    <q-input
-                      filled
-                      class="q-ma-sm"
-                      type="number"
-                      min="0"
-                      v-model="formData.stripe_limits.service_max_amount_sats"
-                      @update:model-value="touchSettings()"
-                      :label="$t('max_incoming_payment_amount')"
-                      :hint="$t('max_incoming_payment_amount_desc')"
-                    ></q-input>
-                  </div>
-                  <div class="col-md-4 col-sm-12">
-                    <q-input
-                      filled
-                      class="q-ma-sm"
-                      v-model="formData.stripe_limits.service_faucet_wallet_id"
-                      @update:model-value="touchSettings()"
-                      :label="$t('faucest_wallet_id')"
-                      :hint="$t('faucest_wallet_id_hint')"
-                    ></q-input>
-                  </div>
-                </div>
-                <q-item>
-                  <q-item-section>
-                    <q-item-label v-text="$t('faucest_wallet')"></q-item-label>
-                    <q-item-label caption>
-                      <ul>
-                        <li>
-                          <span
-                            v-text="$t('faucest_wallet_desc_1', {provider: 'stripe'})"
-                          ></span>
-                        </li>
-                        <li>
-                          <span
-                            v-text="$t('faucest_wallet_desc_2', {provider: 'stripe'})"
-                          ></span>
-                        </li>
-                        <li>
-                          <span v-text="$t('faucest_wallet_desc_3')"></span>
-                        </li>
-                        <li>
-                          <span
-                            v-text="$t('faucest_wallet_desc_4', {provider: 'stripe'})"
-                          ></span>
-                        </li>
-                        <li>
-                          <span v-text="$t('faucest_wallet_desc_5')"></span>
-                        </li>
-                      </ul>
-                      <br />
-                    </q-item-label>
-                  </q-item-section>
-                </q-item>
-              </q-card-section>
-            </q-expansion-item>
-            <q-expansion-item :label="$t('allowed_users')">
-              <q-card-section>
-                <q-input
-                  filled
-                  v-model="formAddStripeUser"
-                  @keydown.enter="addAllowedUser"
-                  type="text"
-                  :label="$t('allowed_users_label')"
-                  :hint="$t('allowed_users_hint_feature', {feature: 'Stripe'})"
-                >
-                  <q-btn
-                    @click="addStripeAllowedUser"
-                    dense
-                    flat
-                    icon="add"
-                  ></q-btn>
-                </q-input>
-                <div>
-                  <q-chip
-                    v-for="user in formData.stripe_limits.allowed_users"
-                    @update:model-value="touchSettings()"
-                    :key="user"
-                    removable
-                    @remove="removeStripeAllowedUser(user)"
-                    color="primary"
-                    text-color="white"
-                    :label="user"
-                    class="ellipsis"
-                  >
-                  </q-chip>
-                </div>
-              </q-card-section>
-            </q-expansion-item>
-          </q-card>
-        </q-expansion-item>
-
-        <q-separator />
-
-        <q-expansion-item header-class="text-primary text-bold">
-          <template v-slot:header>
-            <q-item-section avatar>
-              <q-avatar>
-                <img
-                  :src="'{{ static_url_for('static', 'images/square_logo.png') }}'"
-                />
-              </q-avatar>
-            </q-item-section>
-
-            <q-item-section> Square </q-item-section>
-
-            <q-item-section side>
-              <div class="row items-center">Disabled</div>
-            </q-item-section>
-          </template>
-
-          <q-card>
-            <q-card-section> Coming Soon </q-card-section>
-          </q-card>
-        </q-expansion-item>
-      </q-list>
-    </div>
-  </div>
-</q-tab-panel>
@@ -1,67 +0,0 @@
-<q-tab-panel name="library">
-  <q-card-section class="q-pa-none">
-    <h6 class="q-my-none q-mb-sm">
-      <span v-text="$t('image_library')"></span>
-    </h6>
-    <q-btn
-      color="primary"
-      label="Add Image"
-      @click="$refs.imageInput.click()"
-      class="q-mb-md"
-    />
-    <input
-      type="file"
-      ref="imageInput"
-      accept="image/png, image/jpeg, image/gif"
-      style="display: none"
-      @change="onImageInput"
-    />
-  </q-card-section>
-  <div class="row q-col-gutter-sm q-pa-sm">
-    <div
-      v-for="image in library_images"
-      :key="image.filename"
-      class="col-6 col-sm-4 col-md-3 col-lg-2"
-      style="max-width: 200px"
-    >
-      <q-card class="q-mb-sm">
-        <q-img :src="image.url" style="height: 150px" />
-
-        <q-card-section
-          class="q-pt-md q-pb-md row items-center justify-between"
-        >
-          <small
-            ><div
-              class="text-caption ellipsis"
-              style="max-width: 100px"
-              :title="image.filename"
-              v-text="image.filename"
-            ></div
-          ></small>
-          <q-btn
-            dense
-            flat
-            size="sm"
-            icon="content_copy"
-            @click="copyText(image.url)"
-            :title="$t('copy')"
-            ><q-tooltip>Copy image link</q-tooltip></q-btn
-          >
-          <q-btn
-            dense
-            flat
-            size="sm"
-            icon="delete"
-            color="negative"
-            @click="deleteImage(image.filename)"
-            :title="$t('delete')"
-            ><q-tooltip>Delete image</q-tooltip></q-btn
-          >
-        </q-card-section>
-      </q-card>
-    </div>
-  </div>
-  <div v-if="library_images.length === 0" class="q-pa-xl">
-    <div class="text-subtitle2 text-grey">No images uploaded yet.</div>
-  </div>
-</q-tab-panel>
@@ -1,83 +0,0 @@
-<q-tab-panel name="users">
-  <q-card-section class="q-pa-none">
-    <h6 class="q-my-none q-mb-sm">
-      <span v-text="$t('user_management')"></span>
-    </h6>
-
-    <div class="row">
-      <div class="col-12 col-md-6 q-pr-sm">
-        <p><span v-text="$t('admin_users')"></span></p>
-        <q-input
-          filled
-          v-model="formAddAdmin"
-          @keydown.enter="addAdminUser"
-          type="text"
-          :label="$t('admin_users_label')"
-          :hint="$t('admin_users_hint')"
-        >
-          <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"
-            :label="user"
-            class="ellipsis"
-          >
-          </q-chip>
-        </div>
-        <br />
-      </div>
-      <div class="col-12 col-md-6">
-        <p><span v-text="$t('allowed_users')"></span></p>
-        <q-input
-          filled
-          v-model="formAddUser"
-          @keydown.enter="addAllowedUser"
-          type="text"
-          :label="$t('allowed_users_label')"
-          :hint="$t('allowed_users_hint')"
-        >
-          <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"
-            :label="user"
-            class="ellipsis"
-          >
-          </q-chip>
-        </div>
-        <br />
-        <q-item tag="label" v-ripple>
-          <q-item-section>
-            <q-item-label v-text="$t('allow_creation_user')"></q-item-label>
-            <q-item-label
-              caption
-              v-text="$t('allow_creation_user_desc')"
-            ></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 />
-      </div>
-    </div>
-  </q-card-section>
-</q-tab-panel>
@@ -1,302 +0,0 @@
-{% if not ajax %} {% extends "base.html" %} {% endif %} {% from "macros.jinja"
-import window_vars with context %} {% block scripts %} {{ window_vars(user) }}
-{% endblock %} {% block page %}
-
-<div class="row q-col-gutter-md q-mb-md">
-  <div class="col-12">
-    <q-card>
-      <div class="q-pa-sm">
-        <div class="row items-center justify-between q-gutter-xs">
-          <div class="col">
-            <q-btn
-              :label="$t('save')"
-              color="primary"
-              @click="updateSettings"
-              :disabled="!checkChanges"
-            >
-              <q-tooltip v-if="checkChanges">
-                <span v-text="$t('save_tooltip')"></span>
-              </q-tooltip>
-
-              <q-badge
-                v-if="checkChanges"
-                color="red"
-                rounded
-                floating
-                style="padding: 6px; border-radius: 6px"
-              />
-            </q-btn>
-
-            <q-btn
-              v-if="isSuperUser"
-              :label="$t('restart')"
-              color="primary"
-              @click="restartServer"
-              class="q-ml-md"
-            >
-              <q-tooltip v-if="needsRestart">
-                <span v-text="$t('restart_tooltip')"></span>
-              </q-tooltip>
-
-              <q-badge
-                v-if="needsRestart"
-                color="red"
-                rounded
-                floating
-                style="padding: 6px; border-radius: 6px"
-              />
-            </q-btn>
-
-            <q-btn
-              :label="$t('download_backup')"
-              flat
-              @click="downloadBackup"
-            ></q-btn>
-
-            <q-btn
-              flat
-              v-if="isSuperUser"
-              :label="$t('reset_defaults')"
-              color="primary"
-              @click="deleteSettings"
-              class="float-right"
-            >
-              <q-tooltip>
-                <span v-text="$t('reset_defaults_tooltip')"></span>
-              </q-tooltip>
-            </q-btn>
-          </div>
-          <div></div>
-        </div>
-      </div>
-    </q-card>
-  </div>
-</div>
-
-<div class="row q-col-gutter-md justify-center">
-  <div class="col q-gutter-y-md">
-    <q-card>
-      <!-- Mobile: Horizontal tabs at top -->
-      <q-tabs
-        v-if="$q.screen.lt.md"
-        @update:model-value="showExchangeProvidersTab"
-        v-model="tab"
-        dense
-        active-color="primary"
-        inline-label
-        class="text-primary"
-      >
-        <q-tab name="funding" icon="account_balance_wallet" label="Fund" />
-        <q-tab name="security" icon="security" label="Sec" />
-        <q-tab name="server" icon="settings" label="Srv" />
-        <q-tab name="exchange_providers" icon="swap_horiz" label="Exch" />
-        <q-tab name="fiat_providers" icon="account_balance" label="Fiat" />
-        <q-tab name="extensions" icon="extension" label="Ext" />
-        <q-tab name="notifications" icon="notifications" label="Not" />
-        <q-tab name="audit" icon="receipt_long" label="Aud" />
-        <q-tab name="site_customisation" icon="language" label="Site" />
-        <q-tab name="library" icon="image" label="Lib" />
-      </q-tabs>
-
-      <!-- Desktop: Vertical sidebar with splitter -->
-      <q-splitter v-if="$q.screen.gt.sm">
-        <template v-slot:before>
-          <q-tabs
-            @update:model-value="showExchangeProvidersTab"
-            v-model="tab"
-            vertical
-            active-color="primary"
-          >
-            <q-tab
-              name="funding"
-              icon="account_balance_wallet"
-              :label="$q.screen.gt.sm ? $t('funding') : null"
-              @update="val => tab = val.name"
-              ><q-tooltip v-if="!$q.screen.gt.sm"
-                ><span v-text="$t('funding')"></span></q-tooltip
-            ></q-tab>
-            <q-tab
-              name="security"
-              icon="security"
-              :label="$q.screen.gt.sm ? $t('security') : null"
-              @update="val => tab = val.name"
-              ><q-tooltip v-if="!$q.screen.gt.sm"
-                ><span v-text="$t('security')"></span></q-tooltip
-            ></q-tab>
-            <q-tab
-              name="server"
-              icon="price_change"
-              :label="$q.screen.gt.sm ? $t('payments') : null"
-              @update="val => tab = val.name"
-              ><q-tooltip v-if="!$q.screen.gt.sm"
-                ><span v-text="$t('payments')"></span></q-tooltip
-            ></q-tab>
-            <q-tab
-              name="exchange_providers"
-              icon="show_chart"
-              :label="$q.screen.gt.sm ? $t('exchanges') : null"
-              ><q-tooltip v-if="!$q.screen.gt.sm"
-                ><span v-text="$t('exchanges')"></span></q-tooltip
-            ></q-tab>
-            <q-tab
-              name="fiat_providers"
-              icon="credit_score"
-              :label="$q.screen.gt.sm ? $t('fiat_providers') : null"
-              ><q-tooltip v-if="!$q.screen.gt.sm"
-                ><span v-text="$t('fiat_providers')"></span></q-tooltip
-            ></q-tab>
-            <q-tab
-              name="users"
-              icon="group"
-              :label="$q.screen.gt.sm ? $t('users') : null"
-              @update="val => tab = val.name"
-              ><q-tooltip v-if="!$q.screen.gt.sm"
-                ><span v-text="$t('users')"></span></q-tooltip
-            ></q-tab>
-
-            <q-tab
-              name="extensions"
-              icon="extension"
-              :label="$q.screen.gt.sm ? $t('extensions') : null"
-              @update="val => tab = val.name"
-              ><q-tooltip v-if="!$q.screen.gt.sm"
-                ><span v-text="$t('extensions')"></span></q-tooltip
-            ></q-tab>
-
-            <q-tab
-              name="notifications"
-              icon="notifications"
-              :label="$q.screen.gt.sm ? $t('notifications') : null"
-              @update="val => tab = val.name"
-              ><q-tooltip v-if="!$q.screen.gt.sm"
-                ><span v-text="$t('notifications')"></span></q-tooltip
-            ></q-tab>
-            <q-tab
-              name="audit"
-              icon="playlist_add_check_circle"
-              :label="$q.screen.gt.sm ? $t('audit') : null"
-              @update="val => tab = val.name"
-              ><q-tooltip v-if="!$q.screen.gt.sm"
-                ><span v-text="$t('audit')"></span></q-tooltip
-            ></q-tab>
-            <q-tab
-              name="library"
-              icon="image"
-              :label="$q.screen.gt.sm ? $t('library') : null"
-              @update="val => tab = val.name"
-              ><q-tooltip v-if="!$q.screen.gt.sm"
-                ><span v-text="$t('library')"></span></q-tooltip
-            ></q-tab>
-            <q-tab
-              style="word-break: break-all"
-              name="site_customisation"
-              icon="language"
-              :label="$q.screen.gt.sm ? $t('site_customisation') : null"
-              @update="val => tab = val.name"
-              ><q-tooltip v-if="!$q.screen.gt.sm"
-                ><span v-text="$t('site_customisation')"></span></q-tooltip
-            ></q-tab>
-          </q-tabs>
-        </template>
-
-        <template v-slot:after>
-          <q-form name="settings_form" id="settings_form">
-            <q-scroll-area style="height: 100vh">
-              <q-tab-panels
-                v-model="tab"
-                animated
-                vertical
-                scroll
-                transition-prev="jump-up"
-                transition-next="jump-up"
-              >
-                {% include "admin/_tab_funding.html" %} {% include
-                "admin/_tab_users.html" %} {% include "admin/_tab_server.html"
-                %} {% include "admin/_tab_exchange_providers.html" %}{% include
-                "admin/_tab_fiat_providers.html" %} {% include
-                "admin/_tab_extensions.html" %} {% include
-                "admin/_tab_notifications.html" %} {% include
-                "admin/_tab_security.html" %} {% include "admin/_tab_theme.html"
-                %}{% include "admin/_tab_audit.html"%}{% include
-                "admin/_tab_library.html"%}
-              </q-tab-panels>
-            </q-scroll-area>
-          </q-form>
-        </template>
-      </q-splitter>
-
-      <!-- Mobile: Full-width content without sidebar -->
-      <q-form
-        v-if="$q.screen.lt.md"
-        name="settings_form"
-        id="settings_form_mobile"
-      >
-        <q-scroll-area style="height: 70vh">
-          <q-tab-panels
-            v-model="tab"
-            animated
-            vertical
-            scroll
-            transition-prev="jump-up"
-            transition-next="jump-up"
-            style="overflow-x: hidden; padding: 8px"
-          >
-            {% include "admin/_tab_funding.html" %} {% include
-            "admin/_tab_users.html" %} {% include "admin/_tab_server.html" %} {%
-            include "admin/_tab_exchange_providers.html" %}{% include
-            "admin/_tab_fiat_providers.html" %} {% include
-            "admin/_tab_extensions.html" %} {% include
-            "admin/_tab_notifications.html" %} {% include
-            "admin/_tab_security.html" %} {% include "admin/_tab_theme.html"
-            %}{% include "admin/_tab_audit.html"%}{% include
-            "admin/_tab_library.html"%}
-          </q-tab-panels>
-        </q-scroll-area>
-      </q-form>
-    </q-card>
-  </div>
-</div>
-
-<q-dialog v-model="exchangeData.showTickerConversion" position="top">
-  <q-card class="q-pa-md q-pt-md lnbits__dialog-card">
-    <div class="q-mb-md">
-      <strong v-text="$t('create_ticker_converter')"></strong>
-    </div>
-    <div class="row">
-      <div class="col-12 q-mb-md">
-        <q-select
-          filled
-          dense
-          v-model="exchangeData.convertFromTicker"
-          label="From Currency"
-          :options="{{ currencies | safe }}"
-        ></q-select>
-      </div>
-      <div class="col-12">
-        <q-input
-          v-model="exchangeData.convertToTicker"
-          dense
-          filled
-          label="New Ticker"
-          hint="This ticker will be used for the exchange API calls."
-        >
-        </q-input>
-      </div>
-    </div>
-    <div class="row q-mt-lg">
-      <q-btn
-        @click="addExchangeTickerConversion()"
-        label="Add Ticker Conversion"
-        color="primary"
-      ></q-btn>
-      <q-btn
-        v-close-popup
-        flat
-        color="grey"
-        class="q-ml-auto"
-        v-text="$t('close')"
-      ></q-btn>
-    </div>
-  </q-card>
-</q-dialog>
-{% endblock %}
@@ -1,201 +0,0 @@
-{% if not ajax %} {% extends "base.html" %} {% endif %}
-<!---->
-{% from "macros.jinja" import window_vars with context %}
-<!---->
-{% block scripts %} {{ window_vars(user) }} {% endblock %} {% block page %}
-<div class="row q-col-gutter-md q-mb-md">
-  <div class="col-12">
-    <q-card>
-      <div class="q-pa-sm q-pl-lg">
-        <div class="row items-center justify-between q-gutter-xs">
-          <div class="col">
-            <!-- Optional: Add content here if needed -->
-          </div>
-          <div>
-            <q-btn
-              v-if="g.user.admin"
-              flat
-              round
-              icon="settings"
-              to="/admin#audit"
-            >
-              <q-tooltip v-text="$t('admin_settings')"></q-tooltip>
-            </q-btn>
-          </div>
-        </div>
-      </div>
-    </q-card>
-  </div>
-</div>
-
-<div class="row q-col-gutter-md justify-center q-mb-lg">
-  <div class="col-lg-3 col-md-6 col-sm-12 text-center">
-    <q-card class="q-pt-sm">
-      <strong v-text="$t('components')"></strong>
-      <div style="width: 250px" class="q-pa-sm">
-        <canvas v-if="chartsReady" ref="componentUseChart"></canvas>
-      </div>
-    </q-card>
-  </div>
-  <div class="col-lg-3 col-md-6 col-sm-12 text-center">
-    <q-card class="q-pt-sm">
-      <strong v-text="$t('long_running_endpoints')"></strong>
-      <div style="width: 250px; height: 250px" class="q-pa-sm">
-        <canvas v-if="chartsReady" ref="longDurationChart"></canvas>
-      </div>
-    </q-card>
-  </div>
-  <div class="col-lg-3 col-md-6 col-sm-12 text-center">
-    <q-card class="q-pt-sm">
-      <strong v-text="$t('http_request_methods')"></strong>
-      <div style="width: 250px; height: 250px" class="q-pa-sm">
-        <canvas v-if="chartsReady" ref="requestMethodChart"></canvas>
-      </div>
-    </q-card>
-  </div>
-  <div class="col-lg-3 col-md-6 col-sm-12 text-center">
-    <q-card class="q-pt-sm">
-      <strong v-text="$t('http_response_codes')"></strong>
-      <div style="width: 250px; height: 250px" class="q-pa-sm">
-        <canvas v-if="chartsReady" ref="responseCodeChart"></canvas>
-      </div>
-    </q-card>
-  </div>
-</div>
-
-<div class="row q-col-gutter-md justify-center">
-  <div class="col">
-    <q-card class="q-pa-md">
-      <q-table
-        row-key="id"
-        :rows="auditEntries"
-        :columns="auditTable.columns"
-        v-model:pagination="auditTable.pagination"
-        :filter="auditTable.search"
-        :loading="auditTable.loading"
-        @request="fetchAudit"
-      >
-        <template v-slot:header="props">
-          <q-tr :props="props">
-            <q-th v-for="col in props.cols" :key="col.name" :props="props">
-              <q-input
-                v-if="['ip_address', 'user_id', 'path',].includes(col.name)"
-                v-model="searchData[col.name]"
-                @keydown.enter="searchAuditBy()"
-                @update:model-value="searchAuditBy()"
-                dense
-                type="text"
-                filled
-                clearable
-                :label="col.label"
-              >
-                <template v-slot:append>
-                  <q-icon
-                    name="search"
-                    @click="searchAuditBy()"
-                    class="cursor-pointer"
-                  />
-                </template>
-              </q-input>
-
-              <q-select
-                v-else-if="['component', 'response_code','request_method'].includes(col.name)"
-                v-model="searchData[col.name]"
-                :options="searchOptions[col.name]"
-                @update:model-value="searchAuditBy()"
-                :label="col.label"
-                clearable
-                style="width: 100px"
-              ></q-select>
-
-              <span v-else v-text="col.label"></span>
-            </q-th>
-          </q-tr>
-        </template>
-        <template v-slot:body="props">
-          <q-tr auto-width :props="props">
-            <q-td v-for="col in props.cols" :key="col.name" :props="props">
-              <div v-if="col.name == 'created_at'">
-                <q-btn
-                  icon="description"
-                  :disable="!props.row.request_details"
-                  size="sm"
-                  flat
-                  class="cursor-pointer q-mr-xs"
-                  @click="showDetailsDialog(props.row)"
-                >
-                  <q-tooltip
-                    ><span v-text="$t('request_details')"></span
-                  ></q-tooltip>
-                </q-btn>
-
-                <span v-text="formatDate(props.row.created_at)"></span>
-                <q-tooltip v-if="props.row.delete_at">
-                  <span
-                    v-text="'Will be deleted at: ' + formatDate(props.row.delete_at)"
-                  ></span>
-                </q-tooltip>
-              </div>
-              <div
-                v-else-if="['user_id', 'request_details'].includes(col.name)"
-              >
-                <q-btn
-                  v-if="props.row[col.name]"
-                  icon="content_copy"
-                  size="sm"
-                  flat
-                  class="cursor-pointer q-mr-xs"
-                  @click="copyText(props.row[col.name])"
-                >
-                  <q-tooltip>Copy</q-tooltip>
-                </q-btn>
-                <span v-text="shortify(props.row[col.name])"> </span>
-                <q-tooltip>
-                  <span v-text="props.row[col.name]"></span>
-                </q-tooltip>
-              </div>
-              <span
-                v-else
-                v-text="props.row[col.name]"
-                @click="searchAuditBy(col.name, props.row[col.name])"
-                class="cursor-pointer"
-              ></span>
-            </q-td>
-          </q-tr>
-        </template>
-      </q-table>
-    </q-card>
-  </div>
-</div>
-
-<q-dialog v-model="auditDetailsDialog.show" position="top">
-  <q-card class="q-pa-md q-pt-md lnbits__dialog-card">
-    <strong v-text="$t('http_request_details')"></strong>
-    <q-input
-      filled
-      dense
-      v-model.trim="auditDetailsDialog.data"
-      type="textarea"
-      rows="25"
-    ></q-input>
-
-    <div class="row q-mt-lg">
-      <q-btn
-        @click="copyText(auditDetailsDialog.data)"
-        icon="copy_content"
-        color="grey"
-        flat
-        v-text="$t('copy')"
-      ></q-btn>
-      <q-btn
-        v-close-popup
-        flat
-        color="grey"
-        class="q-ml-auto"
-        v-text="$t('close')"
-      ></q-btn>
-    </div>
-  </q-card>
-</q-dialog>
-
-{% endblock %}
@@ -1,305 +0,0 @@
-<q-expansion-item
-  group="extras"
-  icon="vpn_key"
-  :label="$t('api_keys_api_docs')"
-  :content-inset-level="0.5"
->
-  <q-card-section>
-    <q-list>
-      <q-item dense class="q-pa-none">
-        <q-item-section>
-          <q-item-label>
-            <strong>Node URL: </strong><em v-text="origin"></em>
-          </q-item-label>
-        </q-item-section>
-      </q-item>
-      <q-item dense class="q-pa-none">
-        <q-item-section>
-          <q-item-label>
-            <strong>Wallet ID: </strong><em v-text="wallet.id"></em>
-          </q-item-label>
-        </q-item-section>
-        <q-item-section side>
-          <q-icon
-            name="content_copy"
-            class="cursor-pointer"
-            @click="copyText(wallet.id)"
-          ></q-icon>
-        </q-item-section>
-      </q-item>
-      <q-item dense class="q-pa-none">
-        <q-item-section>
-          <q-item-label>
-            <strong>Admin key: </strong
-            ><em
-              v-text="adminkeyHidden ? '****************' : wallet.adminkey"
-            ></em>
-          </q-item-label>
-        </q-item-section>
-        <q-item-section side>
-          <div>
-            <q-icon
-              :name="adminkeyHidden ? 'visibility_off' : 'visibility'"
-              class="cursor-pointer"
-              @click="adminkeyHidden = !adminkeyHidden"
-            ></q-icon>
-            <q-icon
-              name="content_copy"
-              class="cursor-pointer q-ml-sm"
-              @click="copyText(wallet.adminkey)"
-            ></q-icon>
-            <q-icon name="qr_code" class="cursor-pointer q-ml-sm">
-              <q-popup-proxy>
-                <div class="q-pa-md">
-                  <lnbits-qrcode
-                    :value="wallet.adminkey"
-                    :show-buttons="false"
-                  ></lnbits-qrcode>
-                </div>
-              </q-popup-proxy>
-            </q-icon>
-          </div>
-        </q-item-section>
-      </q-item>
-      <q-item dense class="q-pa-none">
-        <q-item-section>
-          <q-item-label>
-            <strong>Invoice/read key: </strong
-            ><em v-text="inkeyHidden ? '****************' : wallet.inkey"></em>
-          </q-item-label>
-        </q-item-section>
-        <q-item-section side>
-          <div>
-            <q-icon
-              :name="inkeyHidden ? 'visibility_off' : 'visibility'"
-              class="cursor-pointer"
-              @click="inkeyHidden = !inkeyHidden"
-            ></q-icon>
-            <q-icon
-              name="content_copy"
-              class="cursor-pointer q-ml-sm"
-              @click="copyText(wallet.inkey)"
-            ></q-icon>
-            <q-icon name="qr_code" class="cursor-pointer q-ml-sm">
-              <q-popup-proxy>
-                <div class="q-pa-md">
-                  <lnbits-qrcode
-                    :value="wallet.inkey"
-                    :show-buttons="false"
-                  ></lnbits-qrcode>
-                </div>
-              </q-popup-proxy>
-            </q-icon>
-          </div>
-        </q-item-section>
-      </q-item>
-    </q-list>
-  </q-card-section>
-  <q-expansion-item
-    group="api"
-    dense
-    expand-separator
-    label="Get wallet details"
-  >
-    <q-card>
-      <q-card-section>
-        <code><span class="text-light-green">GET</span> /api/v1/wallet</code>
-        <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
-        <code
-          >{"X-Api-Key": "<i
-            v-text="inkeyHidden ? '****************' : wallet.inkey"
-          ></i
-          >"}</code
-        ><br />
-        <h5 class="text-caption q-mt-sm q-mb-none">
-          Returns 200 OK (application/json)
-        </h5>
-        <code
-          >{"id": &lt;string&gt;, "name": &lt;string&gt;, "balance":
-          &lt;int&gt;}</code
-        >
-        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code
-          >curl <span v-text="baseUrl"></span>api/v1/wallet -H "X-Api-Key:
-          <i v-text="inkeyHidden ? '****************' : wallet.inkey"></i
-          >"</code
-        >
-      </q-card-section>
-    </q-card>
-  </q-expansion-item>
-
-  <q-expansion-item
-    group="api"
-    dense
-    expand-separator
-    label="Create an invoice (incoming)"
-  >
-    <q-card>
-      <q-card-section>
-        <code><span class="text-light-green">POST</span> /api/v1/payments</code>
-        <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
-        <code
-          >{"X-Api-Key": "<i
-            v-text="inkeyHidden ? '****************' : wallet.inkey"
-          ></i
-          >"}</code
-        ><br />
-        <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
-        <code
-          >{"out": false, "amount": &lt;int&gt;, "memo": &lt;string&gt;,
-          "expiry": &lt;int&gt;, "unit": &lt;string&gt;, "webhook":
-          &lt;url:string&gt;, "internal": &lt;bool&gt;}</code
-        >
-        <h5 class="text-caption q-mt-sm q-mb-none">
-          Returns 201 CREATED (application/json)
-        </h5>
-        <code
-          >{"payment_hash": &lt;string&gt;, "payment_request":
-          &lt;string&gt;}</code
-        >
-        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code
-          >curl -X POST <span v-text="baseUrl"></span>api/v1/payments -d
-          '{"out": false, "amount": &lt;int&gt;, "memo": &lt;string&gt;}' -H
-          "X-Api-Key:
-          <i v-text="inkeyHidden ? '****************' : wallet.inkey"></i>" -H
-          "Content-type: application/json"</code
-        >
-      </q-card-section>
-    </q-card>
-  </q-expansion-item>
-  <q-expansion-item
-    group="api"
-    dense
-    expand-separator
-    label="Pay an invoice (outgoing)"
-  >
-    <q-card>
-      <q-card-section>
-        <code
-          ><span class="text-light-green">POST</span> /api/v1/payments (reveal
-          admin keys
-          <q-icon
-            :name="adminkeyHidden ? 'visibility_off' : 'visibility'"
-            class="cursor-pointer"
-            @click="adminkeyHidden = !adminkeyHidden"
-          ></q-icon
-          >)</code
-        >
-        <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
-        <code
-          >{"X-Api-Key": "<i
-            v-text="adminkeyHidden ? '****************' : wallet.adminkey"
-          ></i
-          >"}</code
-        >
-        <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
-        <code>{"out": true, "bolt11": &lt;string&gt;}</code>
-        <h5 class="text-caption q-mt-sm q-mb-none">
-          Returns 201 CREATED (application/json)
-        </h5>
-        <code>{"payment_hash": &lt;string&gt;}</code>
-        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code
-          >curl -X POST <span v-text="baseUrl"></span>api/v1/payments -d
-          '{"out": true, "bolt11": &lt;string&gt;}' -H "X-Api-Key:
-          <i v-text="adminkeyHidden ? '****************' : wallet.adminkey"></i
-          >" -H "Content-type: application/json"</code
-        >
-      </q-card-section>
-    </q-card>
-  </q-expansion-item>
-
-  <q-expansion-item
-    group="api"
-    dense
-    expand-separator
-    label="Decode an invoice"
-  >
-    <q-card>
-      <q-card-section>
-        <code
-          ><span class="text-light-green">POST</span>
-          /api/v1/payments/decode</code
-        >
-        <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
-        <code>{"data": &lt;string&gt;}</code>
-        <h5 class="text-caption q-mt-sm q-mb-none">
-          Returns 200 (application/json)
-        </h5>
-        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code
-          >curl -X POST <span v-text="baseUrl"></span>api/v1/payments/decode -d
-          '{"data": &lt;bolt11/lnurl, string&gt;}' -H "Content-type:
-          application/json"</code
-        >
-      </q-card-section>
-    </q-card>
-  </q-expansion-item>
-  <q-expansion-item
-    group="api"
-    dense
-    expand-separator
-    label="Check an invoice (incoming or outgoing)"
-    class="q-pb-md"
-  >
-    <q-card>
-      <q-card-section>
-        <code
-          ><span class="text-light-blue">GET</span>
-          /api/v1/payments/&lt;payment_hash&gt;</code
-        >
-        <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
-        <code
-          >{"X-Api-Key": "<i
-            v-text="inkeyHidden ? '****************' : wallet.inkey"
-          ></i
-          >"}</code
-        >
-        <h5 class="text-caption q-mt-sm q-mb-none">
-          Returns 200 OK (application/json)
-        </h5>
-        <code>{"paid": &lt;bool&gt;}</code>
-        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-        <code
-          >curl -X GET
-          <span v-text="baseUrl"></span>api/v1/payments/&lt;payment_hash&gt; -H
-          "X-Api-Key:
-          <i v-text="inkeyHidden ? '****************' : wallet.inkey"></i>" -H
-          "Content-type: application/json"</code
-        >
-      </q-card-section>
-    </q-card>
-    <q-card>
-      <q-card-section>
-        <code
-          ><span class="text-pink">WS</span>
-          /api/v1/ws/&lt;invoice_key&gt;</code
-        >
-        <h5
-          class="text-caption q-mt-sm q-mb-none"
-          v-text="$t('websocket_example')"
-        ></h5>
-        <code
-          >wscat -c <span v-text="websocketUrl"></span>/<span
-            v-text="inkeyHidden ? '****************' : wallet.inkey"
-          ></span
-        ></code>
-        <h5 class="text-caption q-mt-sm q-mb-none">
-          Returns 200 OK (application/json)/payments
-        </h5>
-        <code>{"balance": &lt;int&gt;, "payment": &lt;object&gt;}</code>
-      </q-card-section>
-    </q-card>
-  </q-expansion-item>
-  <q-separator></q-separator>
-  <q-card-section>
-    <p v-text="$t('reset_wallet_keys_desc')"></p>
-    <q-btn
-      unelevated
-      color="red-10"
-      @click="resetKeys()"
-      :label="$t('reset_wallet_keys')"
-    ></q-btn>
-  </q-card-section>
-</q-expansion-item>
@@ -1,830 +0,0 @@
-{% if not ajax %} {% extends "base.html" %} {% endif %}
-<!---->
-{% from "macros.jinja" import window_vars with context %}
-<!---->
-{% block scripts %} {{ window_vars(user) }}{% endblock %} {% block page %}
-
-<div class="row">
-  <div class="col-12">
-    <q-stepper
-      v-model="step"
-      ref="stepper"
-      color="primary"
-      animated
-      header-nav
-      class="q-pt-sm"
-      @update:model-value="onStepChange"
-    >
-      <q-step
-        :name="1"
-        title="Describe"
-        icon="info"
-        :done="step > 1"
-        style="min-height: 100px"
-      >
-        <div class="row q-col-gutter-md">
-          <div class="col-12">
-            <span class="text-h6">
-              Tell us something about your extension:
-            </span>
-            <ul>
-              <li>This is the first step, you can return and change it.</li>
-              <li>
-                The <code>`name`</code> and
-                <code>`sort description`</code> fields are what the users will
-                see when browsing the list of extensions.
-              </li>
-              <li>
-                The <code>`id`</code> field is used internally and in the URL of
-                your extension.
-              </li>
-            </ul>
-          </div>
-
-          <!-- todo: add icon -->
-
-          <div class="col-12">
-            <div>
-              <q-btn
-                color="primary"
-                label="Upload Existing config"
-                @click="$refs.extensionDataInput.click()"
-                class="q-mb-md"
-              />
-              <input
-                type="file"
-                ref="extensionDataInput"
-                accept="application/json"
-                style="display: none"
-                @change="onJsonDataInput"
-              />
-            </div>
-          </div>
-        </div>
-        <q-separator class="q-mt-sm"></q-separator>
-        <div class="row q-col-gutter-md q-mt-md">
-          <div class="col-md-4 col-sm-12">
-            <q-input
-              filled
-              v-model="extensionData.name"
-              label="Extension Name"
-              hint="The name of your extension"
-            >
-            </q-input>
-          </div>
-          <div class="col-md-4 col-sm-12">
-            <q-input
-              filled
-              v-model="extensionData.id"
-              label="Extension Id"
-              hint="Lowercase letters, numbers, and underscores only (snake_case). This will be used in the URL."
-            >
-            </q-input>
-          </div>
-          <div class="col-md-4 col-sm-12">
-            <q-input
-              filled
-              v-model="extensionData.short_description"
-              label="Short Description"
-              hint="A short description that is shown in the extension list."
-            >
-            </q-input>
-          </div>
-        </div>
-        <div class="row q-mt-lg">
-          <div class="col-12">
-            <q-input
-              filled
-              v-model="extensionData.description"
-              label="Description"
-              hint="A detailed description of your extension."
-              type="textarea"
-              rows="3"
-              maxlength="1000"
-            >
-            </q-input>
-          </div>
-        </div>
-      </q-step>
-
-      <q-step
-        :name="2"
-        title="Settings"
-        icon="settings"
-        :done="step > 2"
-        style="min-height: 100px"
-      >
-        <div class="row q-col-gutter-md q-mt-md">
-          <div class="col-md-8 col-sm-12">
-            <iframe
-              ref="iframeStep2"
-              class="full-width"
-              height="400px"
-              sandbox="allow-scripts allow-same-origin"
-            ></iframe>
-          </div>
-          <div class="col-md-4 col-sm-12">
-            <q-btn
-              @click="previewExtension('settings')"
-              color="primary"
-              outline
-              label="Refresh Preview"
-              class="full-width q-mb-md"
-            ></q-btn>
-            <q-toggle
-              v-model="extensionData.settings_data.enabled"
-              label="Generate Settings Fields"
-              size="md"
-              color="green"
-            />
-            <br />
-
-            <ul>
-              <li>Define what settings your extension will have.</li>
-              <li>
-                You can choose if each user has its own settings or if the
-                settings are global (set by the admin).
-              </li>
-            </ul>
-          </div>
-        </div>
-
-        <q-separator
-          v-if="extensionData.settings_data.enabled"
-          class="q-mt-sm"
-        ></q-separator>
-        <div v-if="extensionData.settings_data.enabled" class="row q-mt-lg">
-          <div class="col-md-2 col-sm-12">
-            <q-select
-              filled
-              dense
-              emit-value
-              map-options
-              v-model="extensionData.settings_data.type"
-              :options="settingsTypes"
-            ></q-select>
-          </div>
-          <div class="col-md-10 col-sm-12 q-pt-sm">
-            <q-badge
-              v-if="extensionData.settings_data.type === 'user'"
-              outline
-              class="text-caption q-ml-md"
-              >Each user can set its own settings for this extension.</q-badge
-            >
-            <q-badge v-else outline class="text-caption q-ml-md"
-              >Settings are set by the admin and apply to all users of the
-              extension</q-badge
-            >
-          </div>
-        </div>
-        <div v-if="extensionData.settings_data.enabled" class="row q-mt-lg">
-          <div class="col-12">
-            <lnbits-data-fields
-              :fields="extensionData.settings_data.fields"
-              :hide-advanced="true"
-            ></lnbits-data-fields>
-          </div>
-        </div>
-      </q-step>
-
-      <q-step
-        :name="3"
-        :done="step > 3"
-        title="Owner Data"
-        icon="list"
-        style="min-height: 100px"
-      >
-        <div class="row q-col-gutter-md q-mt-md">
-          <div class="col-md-8 col-sm-12">
-            <iframe
-              ref="iframeStep3"
-              class="full-width"
-              height="400px"
-              sandbox="allow-scripts allow-same-origin"
-            ></iframe>
-          </div>
-          <div class="col-md-4 col-sm-12">
-            <q-btn
-              @click="previewExtension('owner_data')"
-              color="primary"
-              outline
-              label="Refresh Preview"
-              class="full-width q-mb-md"
-            ></q-btn>
-            <q-input
-              v-model="extensionData.owner_data.name"
-              filled
-              label="Owner Table Name"
-              hint="CamelCase name for the owner data table (e.g. Campaign, PoS, etc.)"
-              class="q-mb-xl"
-            >
-            </q-input>
-
-            <ul>
-              <li>
-                The owner of the extension manages this data. It can add, remove
-                and update instances of it.
-              </li>
-
-              <li>
-                Some fileds are present by default, like
-                <code>created_at</code>, <code>updated_at</code> and
-                <code>extra</code>.
-              </li>
-            </ul>
-          </div>
-        </div>
-
-        <div class="row q-mt-lg">
-          <div class="col-12">
-            <lnbits-data-fields
-              :fields="extensionData.owner_data.fields"
-            ></lnbits-data-fields>
-          </div>
-        </div>
-      </q-step>
-
-      <q-step
-        :name="4"
-        :done="step > 4"
-        title="Client Data"
-        icon="blur_linear"
-        style="min-height: 100px"
-      >
-        <div class="row q-col-gutter-md q-mt-md">
-          <div class="col-md-8 col-sm-12">
-            <iframe
-              ref="iframeStep4"
-              class="full-width"
-              height="400px"
-              sandbox="allow-scripts allow-same-origin"
-            ></iframe>
-          </div>
-          <div class="col-md-4 col-sm-12">
-            <q-btn
-              @click="previewExtension('client_data')"
-              color="primary"
-              outline
-              label="Refresh Preview"
-              class="full-width q-mb-md"
-            ></q-btn>
-            <!-- <q-toggle
-              v-model="extensionData.client_data.enabled"
-              label="Generate Client Table"
-              disable
-              size="md"
-              color="green"
-            />
-
-            <br /> -->
-            <q-input
-              v-if="extensionData.client_data.enabled"
-              v-model="extensionData.client_data.name"
-              filled
-              label="Client Table Name"
-              hint="CamelCase name for the client data table (e.g. Donation, Payment, etc.)"
-              class="q-mb-xl"
-            >
-            </q-input>
-            <ul>
-              <li>
-                This data is created by users of the extension. Usually when
-                they submit a form or make a payment.
-              </li>
-              <li>
-                The owner of the extension can view this data, but should not
-                modify it.
-              </li>
-            </ul>
-          </div>
-        </div>
-        <q-separator
-          v-if="extensionData.client_data.enabled"
-          class="q-mt-sm"
-        ></q-separator>
-        <div v-if="extensionData.client_data.enabled" class="row q-mt-lg">
-          <div class="col-12">
-            <lnbits-data-fields
-              :fields="extensionData.client_data.fields"
-            ></lnbits-data-fields>
-          </div>
-        </div>
-      </q-step>
-
-      <q-step
-        :name="5"
-        :done="step > 5"
-        title="Public Pages"
-        icon="link"
-        style="min-height: 100px"
-      >
-        <div class="row q-col-gutter-md q-mt-md">
-          <div class="col-md-8 col-sm-12">
-            <iframe
-              ref="iframeStep5"
-              class="full-width"
-              height="400px"
-              sandbox="allow-scripts allow-same-origin"
-            ></iframe>
-          </div>
-
-          <div class="col-md-4 col-sm-12">
-            <q-btn
-              @click="previewExtension('public_page')"
-              color="primary"
-              outline
-              label="Refresh Preview"
-              class="full-width q-mb-md"
-            ></q-btn>
-            <q-toggle
-              v-model="extensionData.public_page.has_public_page"
-              label="Generate Public Page"
-              size="md"
-              color="green"
-            />
-            <br />
-
-            <ul>
-              <li>
-                Most extensions have a public page that can be shared (this page
-                will still be accessible even if you have restricted access to
-                your LNbits install).
-              </li>
-            </ul>
-          </div>
-        </div>
-        <div v-if="extensionData.public_page.has_public_page">
-          <div class="row q-col-gutter-md q-mt-md">
-            <div class="col-12 col-md-6">
-              <q-item tag="label" v-ripple>
-                <q-item-section>
-                  <q-item-label>Public page title</q-item-label>
-                  <q-item-label caption
-                    >Select the field from the
-                    <code v-text="extensionData.owner_data.name"></code>&nbsp;
-                    (Owner Data) that will be used as a title for the public
-                    page.</q-item-label
-                  >
-                </q-item-section>
-                <q-item-section>
-                  <q-select
-                    filled
-                    dense
-                    emit-value
-                    map-options
-                    v-model="extensionData.public_page.owner_data_fields.name"
-                    :options="[''].concat(extensionData.owner_data.fields.map(f => f.name))"
-                  ></q-select>
-                </q-item-section>
-              </q-item>
-            </div>
-            <div class="col-12 col-md-6">
-              <q-item tag="label" v-ripple>
-                <q-item-section>
-                  <q-item-label>Public page description</q-item-label>
-                  <q-item-label caption
-                    >Select the field from the
-                    <code v-text="extensionData.owner_data.name"></code>&nbsp;
-                    (Owner Data) that will be used as a description for the
-                    public page.</q-item-label
-                  >
-                </q-item-section>
-                <q-item-section>
-                  <q-select
-                    filled
-                    dense
-                    emit-value
-                    map-options
-                    v-model="extensionData.public_page.owner_data_fields.description"
-                    :options="[''].concat(extensionData.owner_data.fields.map(f => f.name))"
-                  ></q-select>
-                </q-item-section>
-              </q-item>
-            </div>
-            <div class="col-12 col-md-6">
-              <q-item tag="label" v-ripple>
-                <q-item-section>
-                  <q-item-label>Public page inputs</q-item-label>
-                  <q-item-label caption>
-                    <ul class="q-pa-none q-ma-none">
-                      <li>
-                        Select the fields from the
-                        <code v-text="extensionData.client_data.name"></code
-                        >&nbsp; (Client Data) that will be shown as inputs in
-                        the public page form.
-                      </li>
-                      <li>You can select multiple fields.</li>
-                      <li>
-                        A corresponding input field will be created for each
-                        selected field.
-                      </li>
-                    </ul>
-                  </q-item-label>
-                </q-item-section>
-                <q-item-section>
-                  <q-select
-                    filled
-                    dense
-                    emit-value
-                    map-options
-                    multiple
-                    use-chips
-                    v-model="extensionData.public_page.client_data_fields.public_inputs"
-                    :options="extensionData.client_data.fields.map(f => f.name)"
-                  ></q-select>
-                </q-item-section>
-              </q-item>
-            </div>
-            <div class="col-12 col-md-6">
-              <q-item tag="label" v-ripple>
-                <q-item-section>
-                  <q-item-label>Generate Action Button</q-item-label>
-                  <q-item-label caption>
-                    <ul class="q-pa-none q-ma-none">
-                      <li>
-                        If enabled, the public page will have a button to
-                        perform an action (e.g. generate a payment request).
-                      </li>
-                      <li>
-                        The action will use the selected input fields from
-                        <code v-text="extensionData.client_data.name"></code
-                        >&nbsp; (Client Data) as parameters.
-                      </li>
-                      <li>
-                        A corresponding REST API endpoint will be created.
-                      </li>
-                    </ul></q-item-label
-                  >
-                </q-item-section>
-                <q-item-section avatar>
-                  <q-toggle
-                    v-model="extensionData.public_page.action_fields.generate_action"
-                    size="md"
-                    color="green"
-                  />
-                </q-item-section>
-              </q-item>
-            </div>
-          </div>
-          <q-separator
-            v-if="extensionData.public_page.action_fields.generate_action"
-            class="q-mt-sm"
-          ></q-separator>
-
-          <div v-if="extensionData.public_page.action_fields.generate_action">
-            <div class="row q-col-gutter-md q-mt-md">
-              <div class="col-12 col-md-6">
-                <q-item tag="label" v-ripple>
-                  <q-item-section>
-                    <q-item-label>Generate Payment Logic</q-item-label>
-                    <q-item-label caption>
-                      <ul class="q-pa-none q-ma-none">
-                        <li>
-                          If enabled, the endpoint will create an invoice from
-                          the submitted data and the UI will show the QR code
-                          with the invoice.
-                        </li>
-                        <li>
-                          A listener will be created to check for the pay event.
-                        </li>
-                        <li>You must map the fieds.</li>
-                      </ul></q-item-label
-                    >
-                  </q-item-section>
-                  <q-item-section avatar>
-                    <q-toggle
-                      v-model="extensionData.public_page.action_fields.generate_payment_logic"
-                      size="md"
-                      color="green"
-                    />
-                  </q-item-section>
-                </q-item>
-              </div>
-
-              <div class="col-12 col-md-6"></div>
-            </div>
-            <div
-              v-if="extensionData.public_page.action_fields.generate_action && extensionData.public_page.action_fields.generate_payment_logic"
-              class="row q-col-gutter-md q-mt-md"
-            >
-              <div class="col-12 col-md-6">
-                <q-item tag="label" v-ripple>
-                  <q-item-section>
-                    <q-item-label>Wallet</q-item-label>
-                    <q-item-label caption>
-                      <ul class="q-pa-none q-ma-none">
-                        <li>
-                          Select the field from the
-                          <code v-text="extensionData.owner_data.name"></code
-                          >&nbsp; (Owner Data) that represents the wallet which
-                          will generate the invoice and receive the payments.
-                        </li>
-
-                        <li>
-                          Only fields with the type <code>Wallet</code> will be
-                          shown.
-                        </li>
-                      </ul>
-                    </q-item-label>
-                  </q-item-section>
-                  <q-item-section>
-                    <q-select
-                      filled
-                      dense
-                      emit-value
-                      map-options
-                      v-model="extensionData.public_page.action_fields.wallet_id"
-                      :options="[''].concat(extensionData.owner_data.fields.filter(f => f.type === 'wallet').map(f => f.name))"
-                    ></q-select>
-                  </q-item-section>
-                </q-item>
-              </div>
-
-              <div class="col-12 col-md-6">
-                <q-item tag="label" v-ripple>
-                  <q-item-section>
-                    <q-item-label>Currency</q-item-label>
-                    <q-item-label caption>
-                      <ul class="q-pa-none q-ma-none">
-                        <li>
-                          Select the field from the
-                          <code v-text="extensionData.owner_data.name"></code
-                          >&nbsp; (Owner Data) that represents the currency
-                          which will be used to for the amount.
-                        </li>
-                        <li>
-                          Only fields with the type <code>Currency</code> will
-                          be shown.
-                        </li>
-                        <li>Empty if you want to use sats.</li>
-                      </ul>
-                    </q-item-label>
-                  </q-item-section>
-                  <q-item-section>
-                    <q-select
-                      filled
-                      dense
-                      emit-value
-                      map-options
-                      v-model="extensionData.public_page.action_fields.currency"
-                      :options="[''].concat(extensionData.owner_data.fields.filter(f => f.type === 'currency').map(f => f.name))"
-                    ></q-select>
-                  </q-item-section>
-                </q-item>
-              </div>
-
-              <div class="col-12 col-md-6">
-                <q-item tag="label" v-ripple>
-                  <q-item-section>
-                    <q-item-label>Amount</q-item-label>
-                    <q-item-label caption>
-                      <ul class="q-pa-none q-ma-none">
-                        <li>
-                          Select the field from the
-                          <code v-text="extensionData.owner_data.name"></code
-                          >&nbsp; (Owner Data) or
-                          <code v-text="extensionData.client_data.name"></code
-                          >&nbsp; (Client Data) that represents the amount (in
-                          the selected currency).
-                        </li>
-                        <li>
-                          Only fields with the type <code>Integer</code> and
-                          <code>Float</code> will be shown.
-                        </li>
-                      </ul>
-                    </q-item-label>
-                  </q-item-section>
-                  <q-item-section>
-                    <div class="row">
-                      <div class="col-6">
-                        <q-select
-                          filled
-                          dense
-                          emit-value
-                          map-options
-                          v-model="extensionData.public_page.action_fields.amount_source"
-                          :options="amountSource"
-                          class="q-mr-sm"
-                        ></q-select>
-                      </div>
-                      <div class="col-6">
-                        <q-select
-                          filled
-                          dense
-                          emit-value
-                          map-options
-                          v-model="extensionData.public_page.action_fields.amount"
-                          :options="paymentActionAmountFields"
-                        ></q-select>
-                      </div>
-                    </div>
-                  </q-item-section>
-                </q-item>
-              </div>
-
-              <div class="col-12 col-md-6">
-                <q-item tag="label" v-ripple>
-                  <q-item-section>
-                    <q-item-label>Paid Flag</q-item-label>
-                    <q-item-label caption>
-                      <ul class="q-pa-none q-ma-none">
-                        <li>
-                          Select the field from the
-                          <code v-text="extensionData.client_data.name"></code
-                          >&nbsp; (Client Data) that will be set to true when
-                          the invoice is paid.
-                        </li>
-                        <li>
-                          Only fields with the type <code>Boolean</code> will be
-                          shown.
-                        </li>
-                      </ul>
-                    </q-item-label>
-                  </q-item-section>
-                  <q-item-section>
-                    <q-select
-                      filled
-                      dense
-                      emit-value
-                      map-options
-                      v-model="extensionData.public_page.action_fields.paid_flag"
-                      :options="[''].concat(extensionData.client_data.fields.filter(f => f.type === 'bool').map(f => f.name))"
-                    ></q-select>
-                  </q-item-section>
-                </q-item>
-              </div>
-            </div>
-          </div>
-        </div>
-      </q-step>
-
-      <q-step
-        :name="6"
-        :done="step > 6"
-        title="Publish"
-        icon="publish"
-        style="min-height: 100px"
-      >
-        <div v-if="g.user.admin" class="row">
-          <div class="col-md-4 col-sm-12 col-xs-12">
-            <q-select
-              filled
-              dense
-              emit-value
-              map-options
-              v-model="extensionData.stub_version"
-              hint="The version of the extension stub. Make sure it is compatible with your LNbits install."
-              :options="extensionStubVersions.map(f => f.version)"
-            ></q-select>
-          </div>
-          <div class="col-md-4 col-sm-12 col-xs-12">
-            <q-btn
-              @click="cleanCacheData()"
-              color="grey"
-              outline
-              label="Clean Cache"
-              class="q-ml-md"
-            />
-            <q-icon
-              name="info"
-              size="md"
-              color="primary"
-              class="cursor-pointer q-ml-xs q-mb-xs"
-            >
-              <q-tooltip>
-                <ul class="q-pl-sm">
-                  <li>
-                    The extension builder uses caching to speed up the build
-                    process.
-                  </li>
-                  <li>
-                    This action clears old data and redownloads the Extension
-                    Builder Stub release.
-                  </li>
-                </ul>
-              </q-tooltip>
-            </q-icon>
-          </div>
-        </div>
-        <div v-if="g.user.admin" class="row q-mt-md">
-          <div class="col-md-4 col-sm-12 col-xs-12">
-            <div class="row">
-              <q-btn
-                @click="buildExtensionAndDeploy()"
-                color="primary"
-                label="Build and Deploy (Admin Only)"
-                class="col"
-              />
-              <q-icon
-                name="info"
-                size="md"
-                color="primary"
-                class="cursor-pointer q-ml-sm self-center"
-              >
-                <q-tooltip>
-                  <ul class="q-pl-sm">
-                    <li>
-                      Installs the extension directly to this LNbits instance.
-                    </li>
-                    <li>
-                      The extension will be enabled by default, and available to
-                      all users.
-                    </li>
-                  </ul>
-                </q-tooltip>
-              </q-icon>
-            </div>
-          </div>
-        </div>
-
-        <div class="row q-mt-md">
-          <div class="col-md-4 col-sm-12 col-xs-12">
-            <div class="row">
-              <q-btn
-                @click="buildExtension()"
-                outline
-                color="gray"
-                label="Download Extension Zip"
-                icon="download"
-                class="col"
-              />
-              <q-icon
-                name="info"
-                size="md"
-                color="primary"
-                class="cursor-pointer q-ml-sm self-center"
-              >
-                <q-tooltip>
-                  Builds the extension and downloads a zip file with the code.
-                  You can then install it manually in your LNbits instance.
-                </q-tooltip>
-              </q-icon>
-            </div>
-          </div>
-        </div>
-      </q-step>
-
-      <template v-slot:navigation>
-        <q-separator></q-separator>
-        <div class="row">
-          <div class="col-md-6 col-sm-12 q-pl-md q-pt-md">
-            <q-btn
-              v-if="step == 1"
-              label="Clear All Data"
-              color="negative"
-              @click="clearAllData"
-            ></q-btn>
-            <q-btn
-              v-else
-              flat
-              color="grey-8"
-              class="q-mr-sm"
-              @click="previousStep()"
-              label="Back"
-              icon="chevron_left"
-            />
-          </div>
-          <div class="col-md-6 col-sm-12 q-pr-md q-pb-md">
-            <q-stepper-navigation class="float-right">
-              <q-btn
-                v-if="step < 6"
-                @click="nextStep()"
-                color="primary"
-                label="Next"
-              ></q-btn>
-              <template v-else>
-                <q-btn
-                  @click="exportJsonData()"
-                  color="primary"
-                  label="Export JSON Data"
-                ></q-btn>
-                <q-icon
-                  name="info"
-                  size="md"
-                  color="primary"
-                  class="cursor-pointer q-ml-sm self-center"
-                >
-                  <q-tooltip>
-                    <ul class="q-pl-sm">
-                      <li>
-                        Exports the config JSON so it can be later imported or
-                        shared.
-                      </li>
-                      <li>
-                        This JSON is also added to the zip in a file called
-                        `builder.json`.
-                      </li>
-                    </ul>
-                  </q-tooltip>
-                </q-icon>
-              </template>
-            </q-stepper-navigation>
-          </div>
-        </div>
-      </template>
-    </q-stepper>
-  </div>
-</div>
-<div class="row q-col-gutter-md"></div>
-
-{% endblock %}
@@ -1,150 +0,0 @@
-{% extends "public.html" %} {% block page_container %}
-<q-page-container>
-  <q-page class="q-px-md q-py-lg" :class="{'q-px-lg': $q.screen.gt.xs}">
-    {% 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 v-text="$t('welcome_lnbits')"></strong>
-                <p><span v-text="$t('setup_su_account')"></span></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 || $t('invalid_password_repeat')]"
-                  ><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>
-      window.app = Vue.createApp({
-        el: '#vue',
-        mixins: [window.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 %}
-  </q-page>
-</q-page-container>
-{% endblock %}
@@ -1,710 +0,0 @@
-{% extends "public.html" %} {% block scripts %}
-<style>
-  :root {
-    --size: 100px;
-    --gap: 25px;
-  }
-
-  .btn-fixed-width {
-    /* width: 45%; */
-  }
-
-  .wrapper {
-    display: flex;
-    flex-direction: column;
-    gap: var(--gap);
-    margin: auto;
-    max-width: 100%;
-  }
-
-  .marquee {
-    display: flex;
-    overflow: hidden;
-    user-select: none;
-    gap: var(--gap);
-    height: max-content;
-    mask-image: linear-gradient(
-      to right,
-      hsl(0 0% 0% / 0),
-      hsl(0 0% 0% / 1) 20%,
-      hsl(0 0% 0% / 1) 80%,
-      hsl(0 0% 0% / 0)
-    );
-  }
-
-  .marquee__group {
-    flex-shrink: 0;
-    display: flex;
-    align-items: center;
-    justify-content: space-around;
-    gap: var(--gap);
-    min-width: 100%;
-    animation: scroll-x 60s linear infinite;
-  }
-
-  .marquee:hover .marquee__group {
-    animation-play-state: paused;
-  }
-
-  .marquee__group div {
-    width: var(--size);
-  }
-
-  @keyframes scroll-x {
-    from {
-      transform: translateX(0);
-    }
-    to {
-      transform: translateX(calc(-100% - var(--gap)));
-    }
-  }
-</style>
-<script src="{{ static_url_for('static', 'js/index.js') }}"></script>
-{% endblock %} {% block page_container %}
-<q-page-container>
-  <q-page
-    class="q-px-md q-py-lg content-center"
-    :class="{'q-px-lg': $q.screen.gt.xs}"
-  >
-    {% block page %}
-    <div
-      class="row justify-center items-center"
-      style="min-height: calc(100vh / 1.618)"
-    >
-      <div
-        class="full-width"
-        :style="`max-width: ${'{{ LNBITS_CUSTOM_IMAGE }}' ? '850' : '600'}px`"
-      >
-        <div class="row q-mb-md">
-          <div class="col-12">
-            <div>
-              <h5
-                class="q-my-none"
-                v-if="'{{LNBITS_SHOW_HOME_PAGE_ELEMENTS}}' == 'True'"
-              >
-                {{SITE_TITLE}}
-              </h5>
-              <template v-if="$q.screen.gt.sm">
-                <h6
-                  class="q-my-sm"
-                  v-if="'{{LNBITS_SHOW_HOME_PAGE_ELEMENTS}}' == 'True'"
-                >
-                  {{SITE_TAGLINE}}
-                </h6>
-                <p
-                  class="q-my-sm"
-                  v-if="'{{LNBITS_SHOW_HOME_PAGE_ELEMENTS}}' == 'True'"
-                >
-                  {{SITE_DESCRIPTION}}
-                </p>
-              </template>
-              <!-- <div
-            class="gt-sm"
-            v-html="formatDescription"
-            v-if="'{{LNBITS_SHOW_HOME_PAGE_ELEMENTS}}' == 'True'"
-          ></div> -->
-            </div>
-          </div>
-        </div>
-
-        <div class="row">
-          <q-badge
-            v-if="isAccessTokenExpired"
-            class="q-mx-auto q-mb-md"
-            color="primary"
-            rounded
-          >
-            <div class="text-h6">
-              <span v-text="$t('session_has_expired')"></span>
-            </div>
-          </q-badge>
-          <q-card bordered class="full-width q-py-md">
-            <div class="row">
-              <div
-                class="col-12"
-                :class="{'col-sm-7' : '{{ LNBITS_CUSTOM_IMAGE }}', 'col-lg-6' : '{{ LNBITS_CUSTOM_IMAGE }}'}"
-              >
-                {% if lnurl and LNBITS_NEW_ACCOUNTS_ALLOWED and ("user-id-only"
-                in LNBITS_AUTH_METHODS)%}
-                <div class="full-height content-center">
-                  <q-card-section>
-                    <div class="text-body1">
-                      <span v-text="$t('claim_desc')"></span>
-                    </div>
-                  </q-card-section>
-                  <q-card-section>
-                    <q-btn
-                      unelevated
-                      color="primary"
-                      @click="processing"
-                      type="a"
-                      href="/lnurlwallet?lightning={{ lnurl }}"
-                      v-text="$t('press_to_claim')"
-                      class="full-width"
-                    ></q-btn>
-                  </q-card-section>
-                </div>
-                {%else%}
-                <username-password
-                  v-if="authMethod != 'user-id-only'"
-                  :allowed_new_users="allowedRegister"
-                  :auth-methods="LNBITS_AUTH_METHODS"
-                  :auth-action="authAction"
-                  v-model:user-name="username"
-                  v-model:password_1="password"
-                  v-model:password_2="passwordRepeat"
-                  v-model:reset-key="reset_key"
-                  @login="login"
-                  @register="register"
-                  @reset="reset"
-                >
-                  <div
-                    class="text-center text-grey-6"
-                    v-if="authAction !== 'reset'"
-                  >
-                    <p
-                      v-if="authAction === 'login' && allowedRegister"
-                      class="q-mb-none"
-                    >
-                      Not registered?
-                      <a
-                        href="#"
-                        class="text-secondary cursor-pointer"
-                        @click.prevent="showRegister('username-password')"
-                        >Create an Account</a
-                      >
-                    </p>
-                    <p
-                      v-else-if="authAction === 'login' && !allowedRegister"
-                      class="q-mb-none"
-                    >
-                      <span v-text="$t('new_user_not_allowed')"></span>
-                    </p>
-                    <p v-else-if="authAction === 'register'" class="q-mb-none">
-                      <span v-text="$t('existing_account_question')"></span>
-
-                      <a
-                        href="#"
-                        class="text-secondary cursor-pointer q-ml-sm"
-                        @click.prevent="showLogin('username-password')"
-                        v-text="$t('login')"
-                      ></a>
-                    </p>
-                  </div>
-                </username-password>
-                {% if "user-id-only" in LNBITS_AUTH_METHODS %}
-                <user-id-only
-                  :allowed_new_users="allowedRegister"
-                  v-model:usr="usr"
-                  v-model:wallet="walletName"
-                  :auth-action="authAction"
-                  :auth-method="authMethod"
-                  @show-login="showLogin"
-                  @show-register="showRegister"
-                  @login-usr="loginUsr"
-                  @create-wallet="createWallet"
-                >
-                </user-id-only>
-                {%endif%} {% endif %}
-              </div>
-              <div
-                class="col-sm-5 col-lg-6 gt-xs"
-                v-if="'{{ LNBITS_CUSTOM_IMAGE }}'"
-              >
-                <div class="full-height flex flex-center q-pa-lg">
-                  <q-img
-                    :src="'{{ LNBITS_CUSTOM_IMAGE }}'"
-                    :ratio="1"
-                    width="250px"
-                  ></q-img>
-                </div>
-              </div>
-            </div>
-          </q-card>
-        </div>
-      </div>
-      <div
-        v-if="'{{ LNBITS_DENOMINATION }}' == 'sats' && '{{ SITE_TITLE }}' == 'LNbits' && '{{ LNBITS_SHOW_HOME_PAGE_ELEMENTS }}' == 'True'"
-        class="full-width q-mb-lg q-mt-sm"
-      >
-        <div class="flex flex-center q-gutter-md q-py-md">
-          <q-btn
-            outline
-            color="grey"
-            type="a"
-            href="https://github.com/lnbits/lnbits"
-            target="_blank"
-            rel="noopener noreferrer"
-            :label="$t('view_github')"
-            class=""
-          ></q-btn>
-          <q-btn
-            outline
-            color="grey"
-            type="a"
-            href="https://demo.lnbits.com/lnurlp/link/fH59GD"
-            target="_blank"
-            rel="noopener noreferrer"
-            :label="$t('donate')"
-            class=""
-          ></q-btn>
-        </div>
-      </div>
-      {% if AD_SPACE_ENABLED and AD_SPACE %}
-      <div class="q-pt-md full-width">
-        <div class="row justify-center q-mb-xl">
-          <div class="full-width text-center">
-            <span class="text-uppercase text-grey">{{ AD_SPACE_TITLE }}</span>
-          </div>
-          <div class="flex flex-center columm">
-            {% for ADS in AD_SPACE %} {% set AD = ADS.split(';') %}
-            <div class="flex flex-center column q-pr-sm">
-              <a href="{{ AD[0] }}">
-                <img
-                  v-if="($q.dark.isActive)"
-                  src="{{ AD[1] }}"
-                  style="max-width: 420px"
-                  class="full-width"
-                />
-                <img
-                  v-else
-                  src="{{ AD[2] }}"
-                  style="max-width: 420px"
-                  class="full-width"
-                />
-              </a>
-            </div>
-
-            {% endfor %}
-          </div>
-        </div>
-      </div>
-      {% endif %}
-      <div
-        v-if="'{{ LNBITS_DENOMINATION }}' == 'sats' && '{{ SITE_TITLE }}' == 'LNbits' && '{{ LNBITS_SHOW_HOME_PAGE_ELEMENTS }}' == 'True'"
-        class="full-width"
-      >
-        <div class="wrapper">
-          <div class="marquee">
-            <div class="marquee__group">
-              <div>
-                <a
-                  href="https://github.com/ElementsProject/lightning"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/cln.png') }}' : '{{ static_url_for('static', 'images/clnl.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://github.com/lightningnetwork/lnd"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/lnd.png') }}' : '{{ static_url_for('static', 'images/lnd.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://opennode.com"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/opennode.png') }}' : '{{ static_url_for('static', 'images/opennodel.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://lnpay.co/"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/lnpay.png') }}' : '{{ static_url_for('static', 'images/lnpayl.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://github.com/rootzoll/raspiblitz"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/blitz.png') }}' : '{{ static_url_for('static', 'images/blitzl.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://start9.com/"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/start9.png') }}' : '{{ static_url_for('static', 'images/start9l.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://getumbrel.com/"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/umbrel.png') }}' : '{{ static_url_for('static', 'images/umbrell.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://mynodebtc.com"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/mynode.png') }}' : '{{ static_url_for('static', 'images/mynodel.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://github.com/shesek/spark-wallet"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/spark.png') }}' : '{{ static_url_for('static', 'images/sparkl.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://voltage.cloud"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <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>
-                <a
-                  href="https://breez.technology/sdk/"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/breez.png') }}' : '{{ static_url_for('static', 'images/breezl.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://blockstream.com/lightning/greenlight/"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/greenlight.png') }}' : '{{ static_url_for('static', 'images/greenlightl.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <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>
-                <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') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://phoenix.acinq.co/server"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/phoenixd.png') }}' : '{{ static_url_for('static', 'images/phoenixdl.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://boltz.exchange/"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/boltz.svg') }}' : '{{ static_url_for('static', 'images/boltz.svg') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://www.blink.sv/"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/blink_logo.png') }}' : '{{ static_url_for('static', 'images/blink_logol.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <!-- # -->
-            </div>
-            <div class="marquee__group">
-              <div>
-                <a
-                  href="https://github.com/ElementsProject/lightning"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/cln.png') }}' : '{{ static_url_for('static', 'images/clnl.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://github.com/lightningnetwork/lnd"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/lnd.png') }}' : '{{ static_url_for('static', 'images/lnd.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://opennode.com"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/opennode.png') }}' : '{{ static_url_for('static', 'images/opennodel.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://lnpay.co/"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/lnpay.png') }}' : '{{ static_url_for('static', 'images/lnpayl.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://github.com/rootzoll/raspiblitz"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/blitz.png') }}' : '{{ static_url_for('static', 'images/blitzl.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://start9.com/"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/start9.png') }}' : '{{ static_url_for('static', 'images/start9l.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://getumbrel.com/"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/umbrel.png') }}' : '{{ static_url_for('static', 'images/umbrell.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://mynodebtc.com"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/mynode.png') }}' : '{{ static_url_for('static', 'images/mynodel.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://github.com/shesek/spark-wallet"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/spark.png') }}' : '{{ static_url_for('static', 'images/sparkl.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://voltage.cloud"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <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>
-                <a
-                  href="https://breez.technology/sdk/"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/breez.png') }}' : '{{ static_url_for('static', 'images/breezl.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://blockstream.com/lightning/greenlight/"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/greenlight.png') }}' : '{{ static_url_for('static', 'images/greenlightl.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <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>
-                <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') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://phoenix.acinq.co/server"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/phoenixd.png') }}' : '{{ static_url_for('static', 'images/phoenixdl.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://boltz.exchange/"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/boltz.svg') }}' : '{{ static_url_for('static', 'images/boltz.svg') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <div>
-                <a
-                  href="https://www.blink.sv/"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <q-img
-                    contain
-                    :src="($q.dark.isActive) ? '{{ static_url_for('static', 'images/blink_logo.png') }}' : '{{ static_url_for('static', 'images/blink_logol.png') }}'"
-                  ></q-img>
-                </a>
-              </div>
-              <!-- # -->
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    {% endblock %}
-  </q-page>
-</q-page-container>
-{% endblock %}
@@ -1,165 +0,0 @@
-{% if not ajax %} {% extends "base.html" %} {% endif %}
-<!---->
-{% from "macros.jinja" import window_vars with context %}
-<!---->
-{% block scripts %} {{ window_vars(user) }}{% endblock %} {% block page %}
-
-<div class="row q-col-gutter-md q-mb-md">
-  <div class="col-12">
-    <q-card>
-      <div class="q-pa-sm q-pl-lg">
-        <div class="row items-center justify-between q-gutter-xs">
-          <div class="col">
-            <q-btn
-              @click="showAddWalletDialog.show = true"
-              :label="$t('add_wallet')"
-              color="primary"
-            >
-            </q-btn>
-          </div>
-          <div class="float-left">
-            <q-input
-              :label="$t('search_wallets')"
-              dense
-              class="float-right q-pr-xl"
-              v-model="walletsTable.search"
-            >
-              <template v-slot:before>
-                <q-icon name="search"> </q-icon>
-              </template>
-              <template v-slot:append>
-                <q-icon
-                  v-if="walletsTable.search !== ''"
-                  name="close"
-                  @click="walletsTable.search = ''"
-                  class="cursor-pointer"
-                >
-                </q-icon>
-              </template>
-            </q-input>
-          </div>
-        </div>
-      </div>
-    </q-card>
-  </div>
-</div>
-<div>
-  <div>
-    <div>
-      <q-table
-        grid
-        grid-header
-        flat
-        bordered
-        :rows="wallets"
-        :columns="walletsTable.columns"
-        v-model:pagination="walletsTable.pagination"
-        :loading="walletsTable.loading"
-        @request="getUserWallets"
-        row-key="id"
-        :filter="filter"
-        hide-header
-      >
-        <template v-slot:item="props">
-          <div class="q-pa-xs col-xs-12 col-sm-6 col-md-4">
-            <q-card
-              class="q-ma-sm cursor-pointer wallet-list-card"
-              style="text-decoration: none"
-              @click="goToWallet(props.row.id)"
-            >
-              <q-card-section>
-                <div class="row items-center">
-                  <q-avatar
-                    size="lg"
-                    :text-color="$q.dark.isActive ? 'black' : 'grey-3'"
-                    :color="props.row.extra.color"
-                    :icon="props.row.extra.icon"
-                  >
-                  </q-avatar>
-
-                  <div
-                    class="text-h6 q-pl-md ellipsis"
-                    class="text-bold"
-                    v-text="props.row.name"
-                  ></div>
-                  <q-space> </q-space>
-                  <q-btn
-                    v-if="props.row.extra.pinned"
-                    round
-                    color="primary"
-                    text-color="black"
-                    size="xs"
-                    icon="push_pin"
-                    class="float-right"
-                    style="transform: rotate(30deg)"
-                  ></q-btn>
-                </div>
-
-                <div class="row items-center q-pt-sm">
-                  <h6 class="q-my-none ellipsis full-width">
-                    <strong
-                      v-text="formatBalance(props.row.balance_msat / 1000)"
-                    ></strong>
-                  </h6>
-                </div>
-              </q-card-section>
-              <q-separator />
-
-              <q-card-section class="text-left">
-                <small>
-                  <strong>
-                    <span v-text="$t('currency')"></span>
-                  </strong>
-                  <span v-text="props.row.currency || 'sat'"></span>
-                </small>
-                <br />
-                <small>
-                  <strong>
-                    <span v-text="$t('id')"></span>
-                    :
-                  </strong>
-                  <span v-text="props.row.id"></span>
-                </small>
-              </q-card-section>
-            </q-card>
-          </div>
-        </template>
-      </q-table>
-    </div>
-  </div>
-</div>
-
-<q-dialog
-  v-model="showAddWalletDialog.show"
-  persistent
-  @hide="showAddWalletDialog = {show: false}"
->
-  <q-card style="min-width: 350px">
-    <q-card-section>
-      <div class="text-h6">
-        <span v-text="$t('wallet_name')"></span>
-      </div>
-    </q-card-section>
-
-    <q-card-section class="q-pt-none">
-      <q-input
-        dense
-        v-model="showAddWalletDialog.name"
-        autofocus
-        @keyup.enter="submitAddWallet()"
-      ></q-input>
-    </q-card-section>
-
-    <q-card-actions align="right" class="text-primary">
-      <q-btn flat :label="$t('cancel')" v-close-popup></q-btn>
-      <q-btn
-        flat
-        :label="$t('add_wallet')"
-        v-close-popup
-        @click="submitAddWallet()"
-      ></q-btn>
-    </q-card-actions>
-  </q-card>
-</q-dialog>
-
-{% endblock %}
@@ -0,0 +1,3 @@
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
+%} {% block scripts %} {{ window_vars(user) }} {% endblock %} {% block page %}{%
+endblock %}
@@ -0,0 +1,3 @@
+{% extends "public.html" %} {% from "macros.jinja" import window_vars with
+context %} {% block scripts %} {{ window_vars() }} {% endblock %} {% block page
+%} {% endblock %}
@@ -1,379 +0,0 @@
-<q-tab-panel name="channels">
-  <q-dialog v-model="connectPeerDialog.show" position="top">
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-form class="q-gutter-md">
-        <q-input
-          dense
-          type="text"
-          filled
-          v-model="connectPeerDialog.data.uri"
-          label="Node URI"
-          hint="pubkey@host:port"
-        ></q-input>
-
-        <div class="row q-mt-lg">
-          <q-btn
-            :label="$t('connect')"
-            color="primary"
-            @click="connectPeer"
-          ></q-btn>
-          <q-btn
-            v-close-popup
-            flat
-            color="grey"
-            class="q-ml-auto"
-            :label="$t('cancel')"
-          ></q-btn>
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
-
-  <q-dialog v-model="setFeeDialog.show">
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <label class="text-h6">Set Channel Fee</label>
-      <p class="text-caption" v-text="setFeeDialog.channel_id"></p>
-      <q-separator></q-separator>
-      <q-form class="q-gutter-md">
-        <q-input
-          dense
-          type="number"
-          filled
-          v-model.number="setFeeDialog.data.fee_ppm"
-          label="Fee Rate PPM"
-        ></q-input>
-        <q-input
-          dense
-          type="number"
-          filled
-          v-model.number="setFeeDialog.data.fee_base_msat"
-          label="Fee Base msat"
-        ></q-input>
-
-        <div class="row q-mt-lg">
-          <q-btn
-            :label="$t('set')"
-            color="primary"
-            @click="setChannelFee(setFeeDialog.channel_id)"
-          ></q-btn>
-          <q-btn
-            v-close-popup
-            flat
-            color="grey"
-            class="q-ml-auto"
-            :label="$t('cancel')"
-          ></q-btn>
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
-
-  <q-dialog v-model="openChannelDialog.show">
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-form class="q-gutter-md">
-        <q-input
-          dense
-          type="text"
-          filled
-          v-model="openChannelDialog.data.peer_id"
-          label="Peer ID"
-        ></q-input>
-        <q-input
-          dense
-          type="number"
-          filled
-          v-model.number="openChannelDialog.data.funding_amount"
-          label="Funding Amount"
-        ></q-input>
-        <q-expansion-item icon="warning" label="Advanced">
-          <q-card>
-            <q-card-section>
-              <div class="column q-gutter-md">
-                <q-input
-                  dense
-                  type="number"
-                  filled
-                  v-model.number="openChannelDialog.data.push_amount"
-                  label="Push Amount"
-                  hint="This gifts sats to the other side!"
-                ></q-input>
-
-                <q-input
-                  dense
-                  type="number"
-                  filled
-                  v-model.number="openChannelDialog.data.fee_rate"
-                  label="Fee Rate"
-                ></q-input>
-              </div>
-            </q-card-section>
-          </q-card>
-        </q-expansion-item>
-
-        <div class="row q-mt-lg">
-          <q-btn
-            :label="$t('open')"
-            color="primary"
-            @click="openChannel"
-          ></q-btn>
-          <q-btn
-            v-close-popup
-            flat
-            color="grey"
-            class="q-ml-auto"
-            :label="$t('cancel')"
-          ></q-btn>
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
-
-  <q-dialog v-model="closeChannelDialog.show" position="top">
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-form class="q-gutter-md">
-        <div>
-          <q-checkbox v-model="closeChannelDialog.data.force" label="Force" />
-        </div>
-
-        <div class="row q-mt-lg">
-          <q-btn
-            :label="$t('close')"
-            color="primary"
-            @click="closeChannel"
-          ></q-btn>
-          <q-btn
-            v-close-popup
-            flat
-            color="grey"
-            class="q-ml-auto"
-            :label="$t('cancel')"
-          ></q-btn>
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
-
-  <q-card-section class="q-pa-none">
-    <div class="row q-col-gutter-lg">
-      <div class="col-12 col-xl-6">
-        <q-card class="full-height">
-          <q-card-section class="q-gutter-y-sm">
-            <div class="row items-center q-mt-none q-gutter-x-sm no-wrap">
-              <div class="col-grow text-h6 q-my-none col-grow">Channels</div>
-              <q-input
-                filled
-                dense
-                clearable
-                v-model="channels.filter"
-                placeholder="Search..."
-                class="col-auto"
-              ></q-input>
-              <q-select
-                dense
-                size="sm"
-                style="min-width: 200px"
-                filled
-                multiple
-                clearable
-                v-model="stateFilters"
-                :options="this.states"
-                class="col-auto"
-              ></q-select>
-              <q-btn
-                unelevated
-                color="primary"
-                size="md"
-                class="col-auto"
-                @click="showOpenChannelDialog()"
-              >
-                Open channel
-              </q-btn>
-            </div>
-            <div>
-              <div class="text-subtitle1 col-grow">Total</div>
-              <lnbits-channel-balance
-                :balance="this.totalBalance"
-              ></lnbits-channel-balance>
-            </div>
-            <q-separator></q-separator>
-            <q-table
-              dense
-              flat
-              :rows="this.filteredChannels"
-              :filter="channels.filter"
-              no-data-label="No channels opened"
-            >
-              <template v-slot:header="props">
-                <q-tr :props="props" style="height: 0"> </q-tr>
-              </template>
-              <template v-slot:body="props">
-                <q-tr :props="props">
-                  <div class="q-pb-sm">
-                    <div class="row items-center q-gutter-sm">
-                      <div class="text-subtitle1" v-text="props.row.name"></div>
-                      <div class="text-caption" v-if="props.row.peer_id">
-                        <span>Peer ID</span>
-                        <q-btn
-                          size="xs"
-                          flat
-                          dense
-                          icon="content_paste"
-                          @click="copyText(props.row.peer_id)"
-                        ></q-btn>
-                      </div>
-                      <div class="text-caption col-grow">
-                        <span>Fees</span>
-                        <q-btn
-                          size="xs"
-                          flat
-                          dense
-                          icon="settings"
-                          @click="showSetFeeDialog(props.row.id)"
-                        ></q-btn>
-                        <span v-if="props.row.fee_ppm">
-                          <span v-text="props.row.fee_ppm"></span> ppm,
-                          <span v-text="props.row.fee_base_msat"></span> msat
-                        </span>
-                      </div>
-                      <div class="text-caption" v-if="props.row.id">
-                        <span>Channel ID</span>
-                        <q-btn
-                          size="xs"
-                          flat
-                          dense
-                          icon="content_paste"
-                          @click="copyText(props.row.id)"
-                        ></q-btn>
-                      </div>
-                      <div class="text-caption" v-if="props.row.short_id">
-                        <span v-text="props.row.short_id"></span>
-                        <q-btn
-                          size="xs"
-                          flat
-                          dense
-                          icon="content_paste"
-                          @click="copyText(props.row.short_id)"
-                        ></q-btn>
-                      </div>
-                      <q-badge
-                        rounded
-                        :color="states.find(s => s.value == props.row.state)?.color"
-                        v-text="states.find(s => s.value == props.row.state)?.label"
-                      >
-                      </q-badge>
-                      <q-btn
-                        :disable='props.row.state !== "active"'
-                        flat
-                        dense
-                        size="md"
-                        @click="showCloseChannelDialog(props.row)"
-                        icon="cancel"
-                        color="pink"
-                      ></q-btn>
-                    </div>
-
-                    <lnbits-channel-balance
-                      :balance="props.row.balance"
-                      :color="props.row.color"
-                    ></lnbits-channel-balance>
-                  </div>
-                </q-tr>
-              </template>
-            </q-table>
-          </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">
-            <div
-              class="row items-center q-mt-none justify-between q-gutter-x-md no-wrap"
-            >
-              <div class="col-grow text-h6 q-my-none">Peers</div>
-              <q-input
-                filled
-                dense
-                clearable
-                v-model="peers.filter"
-                placeholder="Search..."
-                class="col-auto"
-              ></q-input>
-              <q-btn
-                class="col-auto"
-                color="primary"
-                @click="connectPeerDialog.show = true"
-              >
-                Connect Peer
-              </q-btn>
-            </div>
-            <q-separator></q-separator>
-            <q-table
-              dense
-              flat
-              :rows="peers.data"
-              :filter="peers.filter"
-              no-data-label="No transactions made yet"
-            >
-              <template v-slot:header="props">
-                <q-tr :props="props" style="height: 0"> </q-tr>
-              </template>
-              <template v-slot:body="props">
-                <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="row items-center q-gutter-sm">
-                        <q-badge
-                          :style="`background-color: #${props.row.color}`"
-                          class="text-bold"
-                          v-text="'#'+props.row.color"
-                        >
-                        </q-badge>
-                        <div
-                          class="text-bold"
-                          v-text="shortenNodeId(props.row.id)"
-                        ></div>
-                        <q-btn
-                          size="xs"
-                          flat
-                          dense
-                          icon="content_paste"
-                          @click="copyText(props.row.id)"
-                        ></q-btn>
-                        <q-btn
-                          size="xs"
-                          flat
-                          dense
-                          icon="qr_code"
-                          @click="showNodeInfoDialog(props.row)"
-                        ></q-btn>
-                      </div>
-                    </div>
-                    <q-btn
-                      unelevated
-                      color="primary"
-                      @click="showOpenChannelDialog(props.row.id)"
-                    >
-                      Open channel
-                    </q-btn>
-                    <q-btn
-                      flat
-                      dense
-                      size="md"
-                      @click="disconnectPeer(props.row.id)"
-                      icon="cancel"
-                      color="pink"
-                    ></q-btn>
-                  </div>
-                </q-tr>
-              </template>
-            </q-table>
-          </q-card-section>
-        </q-card>
-      </div>
-    </div>
-  </q-card-section>
-</q-tab-panel>
@@ -1,68 +0,0 @@
-<q-tab-panel name="dashboard">
-  <q-card-section class="q-pa-none">
-    <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')"
-              :msat="this.channel_stats.total_capacity"
-            />
-          </div>
-          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
-            <lnbits-stat title="Balance" :msat="this.info.balance_msat" />
-          </div>
-
-          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
-            <lnbits-stat
-              title="Fees collected"
-              :msat="this.info.fees?.total_msat"
-            />
-          </div>
-
-          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
-            <lnbits-stat
-              title="Onchain Balance"
-              :btc="this.info.onchain_balance_sat / 100000000"
-            />
-          </div>
-
-          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
-            <lnbits-stat
-              title="Onchain Confirmed"
-              :btc="this.info.onchain_confirmed_sat / 100000000"
-            />
-          </div>
-          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
-            <lnbits-stat title="Peers" :amount="this.info.num_peers" />
-          </div>
-          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
-            <lnbits-stat
-              :title="$t('avg_channel_size')"
-              :msat="this.channel_stats.avg_size"
-            />
-          </div>
-          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
-            <lnbits-stat
-              :title="$t('biggest_channel_size')"
-              :msat="this.channel_stats.biggest_size"
-            />
-          </div>
-          <div class="col-12 col-md-6 col-xl-4 q-gutter-y-md">
-            <lnbits-stat
-              :title="$t('smallest_channel_size')"
-              :msat="this.channel_stats.smallest_size"
-            />
-          </div>
-        </div>
-      </div>
-      <div class="column col-12 col-md-4 q-gutter-y-md">
-        <lnbits-node-ranks :ranks="this.ranks"></lnbits-node-ranks>
-        <lnbits-channel-stats
-          :stats="this.channel_stats"
-        ></lnbits-channel-stats>
-      </div>
-    </div>
-  </q-card-section>
-</q-tab-panel>
@@ -1,314 +0,0 @@
-<q-tab-panel name="transactions">
-  <q-card-section class="q-pa-none">
-    <q-dialog v-model="transactionDetailsDialog.show" position="top">
-      <q-card class="my-card">
-        <q-card-section>
-          <div class="text-center q-mb-lg">
-            <div
-              v-if="transactionDetailsDialog.data.isIn && transactionDetailsDialog.data.pending"
-            >
-              <q-icon
-                size="18px"
-                :name="'call_received'"
-                :color="'green'"
-              ></q-icon>
-              <span v-text="$t('payment_received')"></span>
-            </div>
-            <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>
-                <q-icon
-                  name="content_copy"
-                  @click="copyText(transactionDetailsDialog.data.payment_hash)"
-                  size="1em"
-                  color="grey"
-                  class="q-mb-xs cursor-pointer"
-                />
-              </div>
-              <div
-                class="row"
-                v-if="transactionDetailsDialog.data.preimage && !transactionDetailsDialog.data.pending"
-              >
-                <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>
-                  <q-icon
-                    name="content_copy"
-                    @click="copyText(transactionDetailsDialog.data.preimage)"
-                    size="1em"
-                    color="grey"
-                    class="q-mb-xs cursor-pointer"
-                  />
-                </div>
-              </div>
-            </div>
-            <div
-              v-if="transactionDetailsDialog.data.bolt11"
-              class="text-center q-mb-lg"
-            >
-              <a :href="'lightning:' + transactionDetailsDialog.data.bolt11">
-                <q-responsive :ratio="1" class="q-mx-xl">
-                  <qrcode-vue
-                    :value="'lightning:' + transactionDetailsDialog.data.bolt11.toUpperCase()"
-                    :options="{width: 340}"
-                    class="rounded-borders"
-                  ></qrcode-vue>
-                </q-responsive>
-              </a>
-              <q-btn
-                outline
-                color="grey"
-                @click="copyText(transactionDetailsDialog.data.bolt11)"
-                :label="$t('copy_invoice')"
-                class="q-mt-sm"
-              ></q-btn>
-            </div>
-          </div>
-        </q-card-section>
-      </q-card>
-    </q-dialog>
-
-    <div class="row q-col-gutter-md q-pb-lg"></div>
-
-    <div class="row q-col-gutter-lg">
-      <div class="col-12 col-lg-6 q-gutter-y-md">
-        <q-card>
-          <q-card-section>
-            <div class="row items-center no-wrap q-mb-sm">
-              <div class="col text-h6 q-my-none">Payments</div>
-              <q-input
-                v-if="payments.length > 10"
-                filled
-                dense
-                clearable
-                v-model="paymentsTable.filter"
-                debounce="300"
-                placeholder="Search by tag, memo, amount"
-                class="q-mb-md"
-              >
-              </q-input>
-            </div>
-            <q-table
-              dense
-              flat
-              :rows="paymentsTable.data"
-              :columns="paymentsTable.columns"
-              v-model:pagination="paymentsTable.pagination"
-              row-key="payment_hash"
-              no-data-label="No transactions made yet"
-              :filter="paymentsTable.filter"
-              @request="getPayments"
-            >
-              <template v-slot:body-cell-pending="props">
-                <q-td auto-width class="text-center">
-                  <q-icon
-                    v-if="!props.row.pending"
-                    size="xs"
-                    name="call_made"
-                    color="green"
-                    @click="showTransactionDetailsDialog(props.row)"
-                  ></q-icon>
-                  <q-icon
-                    v-else
-                    size="xs"
-                    name="settings_ethernet"
-                    color="grey"
-                    @click="showTransactionDetailsDialog(props.row)"
-                  >
-                    <q-tooltip>Pending</q-tooltip>
-                  </q-icon>
-                  <q-dialog
-                    v-model="props.row.expand"
-                    :props="props"
-                    position="top"
-                  >
-                    <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">
-                          <q-icon
-                            name="settings_ethernet"
-                            color="grey"
-                          ></q-icon>
-                          <span v-text="$t('invoice_waiting')"></span>
-                          <lnbits-payment-details
-                            :payment="props.row"
-                          ></lnbits-payment-details>
-                          <div
-                            v-if="props.row.bolt11"
-                            class="text-center q-mb-lg"
-                          >
-                            <a :href="'lightning:' + props.row.bolt11">
-                              <q-responsive :ratio="1" class="q-mx-xl">
-                                <qrcode-vue
-                                  :value="'lightning:' + props.row.bolt11.toUpperCase()"
-                                  :options="{width: 340}"
-                                  class="rounded-borders"
-                                ></qrcode-vue>
-                              </q-responsive>
-                            </a>
-                          </div>
-                          <div class="row q-mt-lg">
-                            <q-btn
-                              outline
-                              color="grey"
-                              @click="copyText(props.row.bolt11)"
-                              :label="$t('copy_invoice')"
-                            ></q-btn>
-                            <q-btn
-                              v-close-popup
-                              flat
-                              color="grey"
-                              class="q-ml-auto"
-                              :label="$t('close')"
-                            ></q-btn>
-                          </div>
-                        </div>
-                        <div v-else-if="props.row.isPaid && props.row.isIn">
-                          <q-icon
-                            size="18px"
-                            :name="'call_received'"
-                            :color="'green'"
-                          ></q-icon>
-                          <span v-text="$t('payment_received')"></span>
-                          <lnbits-payment-details
-                            :payment="props.row"
-                          ></lnbits-payment-details>
-                        </div>
-                        <div v-else-if="props.row.isPaid && props.row.isOut">
-                          <q-icon
-                            size="18px"
-                            :name="'call_made'"
-                            :color="'pink'"
-                          ></q-icon>
-                          <span v-text="$t('payment_sent')"></span>
-                          <lnbits-payment-details
-                            :payment="props.row"
-                          ></lnbits-payment-details>
-                        </div>
-                        <div v-else-if="props.row.isOut && props.row.pending">
-                          <q-icon
-                            name="settings_ethernet"
-                            color="grey"
-                          ></q-icon>
-                          <span v-text="$t('outgoing_payment_pending')"></span>
-                          <lnbits-payment-details
-                            :payment="props.row"
-                          ></lnbits-payment-details>
-                        </div>
-                      </div>
-                    </q-card>
-                  </q-dialog>
-                </q-td>
-              </template>
-              <template v-slot:body-cell-date="props">
-                <q-td auto-width key="date" :props="props">
-                  <lnbits-date :ts="props.row.time"></lnbits-date>
-                </q-td>
-              </template>
-              <template v-slot:body-cell-destination="props">
-                <q-td auto-width key="destination">
-                  <div class="row items-center justify-between no-wrap">
-                    <q-badge
-                      :style="`background-color: #${props.row.destination?.color}`"
-                      class="text-bold"
-                      v-text="props.row.destination?.alias"
-                    ></q-badge>
-                    <div>
-                      <q-btn
-                        size="xs"
-                        flat
-                        dense
-                        icon="content_paste"
-                        @click="copyText(info.id)"
-                      ></q-btn>
-                      <q-btn
-                        size="xs"
-                        flat
-                        dense
-                        icon="qr_code"
-                        @click="showNodeInfoDialog(props.row.destination)"
-                      ></q-btn>
-                    </div>
-                  </div>
-                </q-td>
-              </template>
-            </q-table>
-          </q-card-section>
-        </q-card>
-      </div>
-      <div class="col-12 col-lg-6 q-gutter-y-md">
-        <q-card>
-          <q-card-section>
-            <div class="row items-center no-wrap q-mb-sm">
-              <div class="col text-h6 q-my-none">Invoices</div>
-              <q-input
-                v-if="payments.length > 10"
-                filled
-                dense
-                clearable
-                v-model="paymentsTable.filter"
-                debounce="300"
-                placeholder="Search by tag, memo, amount"
-                class="q-mb-md"
-              >
-              </q-input>
-            </div>
-
-            <q-table
-              dense
-              flat
-              :rows="invoiceTable.data"
-              :columns="invoiceTable.columns"
-              v-model:pagination="invoiceTable.pagination"
-              no-data-label="No transactions made yet"
-              :filter="invoiceTable.filter"
-              @request="getInvoices"
-            >
-              <template v-slot:body-cell-pending="props">
-                <q-td auto-width class="text-center">
-                  <q-icon
-                    v-if="!props.row.pending"
-                    size="xs"
-                    name="call_received"
-                    color="green"
-                    @click="showTransactionDetailsDialog(props.row)"
-                  ></q-icon>
-                  <q-icon
-                    v-else
-                    size="xs"
-                    name="settings_ethernet"
-                    color="grey"
-                    @click="showTransactionDetailsDialog(props.row)"
-                  >
-                    <q-tooltip>Pending</q-tooltip>
-                  </q-icon>
-                </q-td>
-              </template>
-
-              <template v-slot:body-cell-paid_at="props">
-                <q-td auto-width :props="props">
-                  <lnbits-date
-                    v-if="props.row.paid_at"
-                    :ts="props.row.paid_at"
-                  ></lnbits-date>
-                </q-td>
-              </template>
-
-              <template v-slot:body-cell-expiry="props">
-                <q-td auto-width :props="props">
-                  <lnbits-date
-                    v-if="props.row.expiry"
-                    :ts="props.row.expiry"
-                  ></lnbits-date>
-                </q-td>
-              </template>
-            </q-table>
-          </q-card-section>
-        </q-card>
-      </div>
-    </div>
-  </q-card-section>
-</q-tab-panel>
@@ -1,46 +0,0 @@
-{% if not ajax %} {% extends "base.html" %} {% endif %}
-<!---->
-{% from "macros.jinja" import window_vars with context %}
-<!---->
-{% block scripts %} {{ window_vars(user) }}{% endblock %} {% block page %}
-
-<q-dialog v-model="nodeInfoDialog.show" position="top">
-  <lnbits-node-qrcode :info="nodeInfoDialog.data"></lnbits-node-qrcode>
-</q-dialog>
-
-<div class="row q-col-gutter-md justify-center">
-  <div class="col q-gutter-y-md">
-    <q-card>
-      <div class="q-pa-md">
-        <div class="q-gutter-y-md">
-          <q-tabs v-model="tab" active-color="primary" align="justify">
-            <q-tab
-              name="dashboard"
-              :label="$t('dashboard')"
-              @update="val => tab = val.name"
-            ></q-tab>
-            <q-tab
-              name="channels"
-              :label="$t('channels')"
-              @update="val => tab = val.name"
-            ></q-tab>
-            <q-tab
-              name="transactions"
-              :label="$t('transactions')"
-              @update="val => tab = val.name"
-            ></q-tab>
-          </q-tabs>
-        </div>
-      </div>
-
-      <q-form name="settings_form" id="settings_form">
-        <q-tab-panels v-model="tab" animated>
-          {% include "node/_tab_dashboard.html" %} {% include
-          "node/_tab_channels.html" %} {% include "node/_tab_transactions.html"
-          %}
-        </q-tab-panels>
-      </q-form>
-    </q-card>
-  </div>
-</div>
-{% endblock %}
@@ -1,133 +0,0 @@
-{% extends "public.html" %} {% from "macros.jinja" import window_vars with
-context %} {% block page %}
-
-<div class="q-ma-lg-xl q-mx-auto q-ma-xl" style="max-width: 1048px">
-  <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 q-gutter-y-md">
-          <lnbits-stat
-            :title="$t('total_capacity')"
-            :msat="this.channel_stats.total_capacity"
-          />
-        </div>
-
-        <div class="col-12 col-md-6 q-gutter-y-md">
-          <lnbits-stat title="Peers" :amount="this.info.num_peers" />
-        </div>
-        <div class="col-12 col-md-6 q-gutter-y-md">
-          <lnbits-stat
-            :title="$t('avg_channel_size')"
-            :msat="this.channel_stats.avg_size"
-          />
-        </div>
-        <div class="col-12 col-md-6 q-gutter-y-md">
-          <lnbits-stat
-            :title="$t('biggest_channel_size')"
-            :msat="this.channel_stats.biggest_size"
-          />
-        </div>
-        <div class="col-12 col-md-6 q-gutter-y-md">
-          <lnbits-stat
-            :title="$t('smallest_channel_size')"
-            :msat="this.channel_stats.smallest_size"
-          />
-        </div>
-        <div class="col-12 col-md-6 q-gutter-y-md">
-          <lnbits-stat
-            :title="$t('smallest_channel_size')"
-            :msat="this.channel_stats.smallest_size"
-          />
-        </div>
-      </div>
-    </div>
-    <div class="column col-12 col-md-4 q-gutter-y-md">
-      <lnbits-node-ranks :ranks="this.ranks"></lnbits-node-ranks>
-      <lnbits-channel-stats :stats="this.channel_stats"></lnbits-channel-stats>
-    </div>
-  </div>
-</div>
-
-{% endblock %} {% block scripts %} {{ window_vars(user) }}
-<script src="{{ static_url_for('static', 'js/node.js') }}"></script>
-<script>
-  window.app = Vue.createApp({
-    el: '#vue',
-    config: {
-      globalProperties: {
-        LNbits,
-        msg: 'hello'
-      }
-    },
-    mixins: [window.windowMixin],
-    data: function () {
-      return {
-        isSuperUser: false,
-        wallet: {},
-        tab: 'dashboard',
-        payments: 1000,
-        info: {},
-        channel_stats: {},
-        channels: [],
-        activeBalance: {},
-        ranks: {},
-
-        peers: [],
-
-        connectPeerDialog: {
-          show: false,
-          data: {}
-        },
-
-        openChannelDialog: {
-          show: false,
-          data: {}
-        },
-
-        closeChannelDialog: {
-          show: false,
-          data: {}
-        },
-
-        nodeInfoDialog: {
-          show: false,
-          data: {}
-        },
-
-        states: [
-          {label: 'Active', value: 'active', color: 'green'},
-          {label: 'Pending', value: 'pending', color: 'orange'},
-          {label: 'Inactive', value: 'inactive', color: 'grey'},
-          {label: 'Closed', value: 'closed', color: 'red'}
-        ]
-      }
-    },
-    created: function () {
-      this.getInfo()
-      this.get1MLStats()
-    },
-    methods: {
-      formatMsat: function (msat) {
-        return LNbits.utils.formatMsat(msat)
-      },
-      api: function (method, url, data) {
-        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
-        })
-      },
-      get1MLStats: function () {
-        this.api('GET', '/rank', {}).then(response => {
-          this.ranks = response.data
-        })
-      }
-    }
-  })
-</script>
-
-{% endblock %}
@@ -1,432 +0,0 @@
-{% if not ajax %} {% extends "base.html" %} {% endif %}
-<!---->
-{% from "macros.jinja" import window_vars with context %}
-<!---->
-{% block scripts %} {{ window_vars(user) }} {% endblock %} {% block page %}
-<div class="row q-col-gutter-md q-mb-md">
-  <div class="col-12">
-    <q-card>
-      <div class="q-pa-sm q-pl-lg">
-        <div class="row items-center justify-between q-gutter-xs">
-          <div class="col"></div>
-          <div class="float-left">
-            <q-checkbox
-              dense
-              @click="saveChartsPreferences"
-              v-model="chartData.showPaymentStatus"
-              :label="$t('payments_status_chart')"
-            >
-            </q-checkbox>
-          </div>
-          <q-separator vertical class="q-ma-sm"></q-separator>
-          <div class="float-left">
-            <q-checkbox
-              dense
-              @click="saveChartsPreferences"
-              v-model="chartData.showPaymentTags"
-              :label="$t('payments_tag_chart')"
-            >
-            </q-checkbox>
-          </div>
-          <q-separator vertical class="q-ma-sm"></q-separator>
-          <div class="float-left">
-            <q-checkbox
-              dense
-              @click="saveChartsPreferences"
-              v-model="chartData.showBalance"
-              :label="$t('payments_balance_chart')"
-            >
-            </q-checkbox>
-          </div>
-          <q-separator vertical class="q-ma-sm"></q-separator>
-          <div class="float-left">
-            <q-checkbox
-              dense
-              @click="saveChartsPreferences"
-              v-model="chartData.showWalletsSize"
-              :label="$t('payments_wallets_chart')"
-            >
-            </q-checkbox>
-          </div>
-
-          <q-separator vertical class="q-ma-sm"></q-separator>
-          <div class="float-left">
-            <q-checkbox
-              dense
-              @click="saveChartsPreferences"
-              v-model="chartData.showBalanceInOut"
-              :label="$t('payments_balance_in_out_chart')"
-            >
-            </q-checkbox>
-          </div>
-          <q-separator vertical class="q-ma-sm"></q-separator>
-          <div class="float-left">
-            <q-checkbox
-              dense
-              @click="saveChartsPreferences"
-              v-model="chartData.showPaymentCountInOut"
-              :label="$t('payments_count_in_out_chart')"
-            >
-            </q-checkbox>
-          </div>
-          <q-separator vertical class="q-ma-sm"></q-separator>
-          <q-btn icon="event" outline flat>
-            <q-popup-proxy
-              cover
-              transition-show="scale"
-              transition-hide="scale"
-            >
-              <q-date v-model="searchDate" mask="YYYY-MM-DD" range />
-              <div class="row">
-                <div class="col-6">
-                  <q-btn
-                    label="Search"
-                    @click="searchByDate()"
-                    color="primary"
-                    flat
-                    class="float-left"
-                    v-close-popup
-                  />
-                </div>
-                <div class="col-6">
-                  <q-btn
-                    v-close-popup
-                    @click="clearDateSeach()"
-                    label="Clear"
-                    class="float-right"
-                    color="grey"
-                    flat
-                  />
-                </div>
-              </div>
-            </q-popup-proxy>
-            <q-badge
-              v-if="searchDate?.to || searchDate?.from"
-              class="q-mt-lg q-mr-md"
-              color="primary"
-              rounded
-              floating
-              style="border-radius: 6px"
-            />
-          </q-btn>
-          <q-separator vertical class="q-ma-sm"></q-separator>
-          <div>
-            <q-btn
-              v-if="g.user.admin"
-              flat
-              round
-              icon="settings"
-              to="/admin#server"
-            >
-              <q-tooltip v-text="$t('admin_settings')"></q-tooltip>
-            </q-btn>
-          </div>
-        </div>
-      </div>
-    </q-card>
-  </div>
-</div>
-<div v-show="!showDetails">
-  <div class="row q-col-gutter-md justify-center q-mb-md">
-    <div
-      v-show="chartData.showPaymentStatus"
-      class="col-lg-3 col-md-6 col-sm-12 text-center"
-    >
-      <q-card class="q-pt-sm">
-        <strong v-text="$t('payment_chart_status')"></strong>
-        <div style="height: 300px" class="q-pa-sm">
-          <canvas v-if="chartsReady" ref="paymentsStatusChart"></canvas>
-        </div>
-      </q-card>
-    </div>
-    <div
-      v-show="chartData.showPaymentStatus"
-      class="col-lg-3 col-md-6 col-sm-12 text-center"
-    >
-      <q-card class="q-pt-sm">
-        <strong v-text="$t('payment_chart_tags')"></strong>
-        <div style="height: 300px" class="q-pa-sm">
-          <canvas v-if="chartsReady" ref="paymentsTagsChart"></canvas>
-        </div>
-      </q-card>
-    </div>
-    <div
-      v-show="chartData.showBalance"
-      class="col-lg-6 col-md-12 col-sm-12 text-center"
-    >
-      <q-card class="q-pt-sm">
-        <strong
-          v-text="$t('lnbits_balance', {balance: (lnbitsBalance || 0).toLocaleString()})"
-        ></strong>
-        <div style="height: 300px" class="q-pa-sm">
-          <canvas v-if="chartsReady" ref="paymentsDailyChart"></canvas>
-        </div>
-      </q-card>
-    </div>
-    <div
-      v-show="chartData.showWalletsSize"
-      class="col-lg-6 col-md-12 col-sm-12 text-center"
-    >
-      <q-card class="q-pt-sm">
-        <strong v-text="$t('payment_chart_tx_per_wallet')"></strong>
-        <div style="height: 300px" class="q-pa-sm">
-          <canvas v-if="chartsReady" ref="paymentsWalletsChart"></canvas>
-        </div>
-      </q-card>
-    </div>
-
-    <div
-      v-show="chartData.showBalanceInOut"
-      class="col-lg-6 col-md-12 col-sm-12 text-center"
-    >
-      <q-card class="q-pt-sm">
-        <strong v-text="$t('payments_balance_in_out')"></strong>
-        <div style="height: 300px" class="q-pa-sm">
-          <canvas v-if="chartsReady" ref="paymentsBalanceInOutChart"></canvas>
-        </div>
-      </q-card>
-    </div>
-    <div
-      v-show="chartData.showPaymentCountInOut"
-      class="col-lg-6 col-md-12 col-sm-12 text-center"
-    >
-      <q-card class="q-pt-sm">
-        <strong v-text="$t('payments_count_in_out')"></strong>
-        <div style="height: 300px" class="q-pa-sm">
-          <canvas v-if="chartsReady" ref="paymentsCountInOutChart"></canvas>
-        </div>
-      </q-card>
-    </div>
-  </div>
-
-  <div class="row q-col-gutter-md justify-center">
-    <div class="col">
-      <q-card class="q-pa-md">
-        <q-table
-          row-key="payment_hash"
-          :rows="payments"
-          :columns="paymentsTable.columns"
-          v-model:pagination="paymentsTable.pagination"
-          :filter="paymentsTable.search"
-          @request="fetchPayments"
-        >
-          <template v-slot:header="props">
-            <q-tr :props="props">
-              <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                <q-input
-                  v-if="['wallet_id', 'payment_hash', 'memo'].includes(col.name)"
-                  v-model="searchData[col.name]"
-                  @keydown.enter="searchPaymentsBy()"
-                  @update:model-value="searchPaymentsBy()"
-                  dense
-                  type="text"
-                  filled
-                  clearable
-                  :label="col.label"
-                >
-                  <template v-slot:append>
-                    <q-icon
-                      name="search"
-                      @click="searchPaymentsBy()"
-                      class="cursor-pointer"
-                    />
-                  </template>
-                </q-input>
-                <q-btn
-                  v-else-if="['status'].includes(col.name)"
-                  flat
-                  dense
-                  :label="$q.screen.gt.md ? 'Status' : null"
-                  icon="filter_alt"
-                  color="grey"
-                  class="text-capitalize"
-                >
-                  <q-menu anchor="top right" self="top start">
-                    <q-item dense>
-                      <q-checkbox
-                        v-model="statusFilters.success"
-                        @click="handleFilterChanged"
-                        label="Success Payments"
-                      ></q-checkbox>
-                    </q-item>
-                    <q-item dense>
-                      <q-checkbox
-                        v-model="statusFilters.pending"
-                        @click="handleFilterChanged"
-                        label="Pending Payments"
-                      ></q-checkbox>
-                    </q-item>
-                    <q-item dense>
-                      <q-checkbox
-                        v-model="statusFilters.failed"
-                        @click="handleFilterChanged"
-                        label="Failed Payments"
-                      ></q-checkbox>
-                    </q-item>
-                    <q-separator></q-separator>
-                    <q-item dense>
-                      <q-checkbox
-                        v-model="statusFilters.incoming"
-                        @click="handleFilterChanged"
-                        label="Incoming Payments"
-                      ></q-checkbox>
-                    </q-item>
-                    <q-item dense>
-                      <q-checkbox
-                        v-model="statusFilters.outgoing"
-                        @click="handleFilterChanged"
-                        label="Outgoing Payments"
-                      ></q-checkbox>
-                    </q-item>
-                  </q-menu>
-                  <q-tooltip>
-                    <span v-text="$t('filter_payments')"></span>
-                  </q-tooltip>
-                </q-btn>
-                <q-select
-                  v-else-if="['tag'].includes(col.name)"
-                  v-model="searchData[col.name]"
-                  :options="searchOptions[col.name]"
-                  @update:model-value="searchPaymentsBy()"
-                  :label="col.label"
-                  clearable
-                  style="width: 100px"
-                ></q-select>
-                <span v-else v-text="col.label"></span>
-              </q-th>
-            </q-tr>
-          </template>
-          <template v-slot:body="props">
-            <q-tr auto-width :props="props">
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                <div v-if="col.name == 'status'">
-                  <q-tooltip
-                    ><span v-text="$t('payment_details')"></span
-                  ></q-tooltip>
-                  <q-icon
-                    @click="showDetailsToggle(props.row)"
-                    v-if="props.row.status === 'success'"
-                    size="14px"
-                    :name="props.row.outgoing ? 'call_made' : 'call_received'"
-                    :color="props.row.outgoing ? 'pink' : 'green'"
-                    class="cursor-pointer"
-                  ></q-icon>
-                  <q-icon
-                    v-else-if="props.row.status === 'pending'"
-                    @click="showDetailsToggle(props.row)"
-                    name="downloading"
-                    :style="props.row.outgoing ? 'transform: rotate(225deg)' : 'transform: scaleX(-1) rotate(315deg)'"
-                    color="grey"
-                    class="cursor-pointer"
-                  ></q-icon>
-                  <q-icon
-                    v-else
-                    @click="showDetailsToggle(props.row)"
-                    name="warning"
-                    color="yellow"
-                    class="cursor-pointer"
-                  ></q-icon>
-                </div>
-                <div v-else-if="col.name == 'created_at'">
-                  <div>
-                    <q-tooltip anchor="top middle">
-                      <span v-text="formatDate(props.row.created_at)"></span>
-                    </q-tooltip>
-                    <span v-text="props.row.timeFrom"> </span>
-                  </div>
-                </div>
-                <div
-                  v-else-if="['wallet_id', 'payment_hash', 'memo'].includes(col.name)"
-                >
-                  <q-btn
-                    v-if="props.row[col.name]"
-                    icon="content_copy"
-                    size="sm"
-                    flat
-                    class="cursor-pointer q-mr-xs"
-                    @click="copyText(props.row[col.name])"
-                  >
-                    <q-tooltip anchor="top middle">Copy</q-tooltip>
-                  </q-btn>
-                  <span v-text="shortify(props.row[col.name], col.max_length)">
-                  </span>
-                  <q-tooltip>
-                    <span v-text="props.row[col.name]"></span>
-                  </q-tooltip>
-                </div>
-                <span
-                  v-else
-                  v-text="props.row[col.name]"
-                  class="cursor-pointer"
-                ></span>
-              </q-td>
-            </q-tr>
-          </template>
-        </q-table>
-      </q-card>
-    </div>
-  </div>
-</div>
-<div v-show="showDetails">
-  <q-card>
-    <q-card-section class="flex">
-      <div>
-        <q-btn
-          flat
-          round
-          icon="arrow_back"
-          class="q-mr-md"
-          @click="showDetailsToggle(null)"
-        ></q-btn>
-      </div>
-      <div class="self-center text-h6 text-weight-bolder text-grey-5">
-        <span v-text="$t('payment_details_back')"></span>
-      </div>
-    </q-card-section>
-    <q-separator></q-separator>
-    <q-card-section class="text-h6">
-      <q-item>
-        <q-item-section avatar class="">
-          <q-icon color="primary" name="receipt" size="44px"></q-icon>
-        </q-item-section>
-
-        <q-item-section>
-          <q-item-label>
-            <div class="text-h6">
-              <span v-text="$t('payment_details')"></span>
-            </div>
-          </q-item-label>
-          <q-item-label caption v-text="$t('payment_details_desc')">
-          </q-item-label>
-        </q-item-section>
-      </q-item>
-    </q-card-section>
-    <q-card-section>
-      <q-list separator>
-        <q-item v-for="(value, key) in paymentDetails" :key="key">
-          <q-item-section>
-            <q-item-label v-text="key"></q-item-label>
-            <q-item-label
-              caption
-              v-text="value"
-              style="word-wrap: break-word"
-            ></q-item-label>
-          </q-item-section>
-          <q-item-section side>
-            <q-btn
-              v-show="value"
-              icon="content_copy"
-              flat
-              class="cursor-pointer q-ml-sm"
-              @click="copyText(value)"
-            >
-              <q-tooltip>Copy</q-tooltip>
-            </q-btn>
-          </q-item-section>
-          <!-- <q-separator></q-separator> -->
-        </q-item>
-      </q-list>
-    </q-card-section>
-  </q-card>
-</div>
-{% endblock %}
@@ -1,44 +0,0 @@
-<q-dialog v-model="createWalletDialog.show" position="top">
-  <q-card class="q-pa-md q-pt-md lnbits__dialog-card">
-    <strong>Create Wallet</strong>
-    <div class="row">
-      <div class="col-12">
-        <div class="row q-mt-lg">
-          <div class="col">
-            <q-input
-              v-model="createWalletDialog.data.name"
-              :label='$t("name_your_wallet")'
-              filled
-              dense
-              class="q-mb-md"
-            >
-            </q-input>
-          </div>
-        </div>
-        <div class="row q-mt-lg">
-          <div class="col">
-            <q-select
-              filled
-              dense
-              v-model="createWalletDialog.data.currency"
-              :options="{{ currencies | safe }}"
-            ></q-select>
-          </div>
-        </div>
-        <div class="row q-mt-lg">
-          <q-btn
-            v-close-popup
-            @click="createWallet()"
-            unelevated
-            color="primary"
-            type="submit"
-            >Create</q-btn
-          >
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-            >Cancel</q-btn
-          >
-        </div>
-      </div>
-    </div>
-  </q-card>
-</q-dialog>
@@ -1,196 +0,0 @@
-<div class="row q-mb-lg">
-  <div class="col">
-    <q-btn
-      icon="arrow_back_ios"
-      @click="backToUsersPage()"
-      :label="$t('back')"
-    ></q-btn>
-    <q-btn
-      v-if="activeUser.data.id"
-      @click="updateUser()"
-      color="primary"
-      :label="$t('update_account')"
-      class="q-ml-md"
-    ></q-btn>
-    <q-btn
-      v-else
-      @click="createUser()"
-      :label="$t('create_account')"
-      color="primary"
-      class="float-right"
-    ></q-btn>
-  </div>
-</div>
-<q-card v-if="activeUser.show" class="q-pa-md">
-  <q-card-section>
-    <div class="text-h6">
-      <span v-if="activeUser.data.id" v-text="$t('update_account')"></span>
-      <span v-else v-text="$t('create_account')"></span>
-    </div>
-  </q-card-section>
-  <q-card-section>
-    <q-input
-      v-if="activeUser.data.id"
-      v-model="activeUser.data.id"
-      :label="$t('user_id')"
-      filled
-      dense
-      readonly
-      :type="activeUser.data.showUserId ? 'text': 'password'"
-      class="q-mb-md"
-      ><q-btn
-        @click="activeUser.data.showUserId = !activeUser.data.showUserId"
-        dense
-        flat
-        :icon="activeUser.data.showUserId ? 'visibility_off' : 'visibility'"
-        color="grey"
-      ></q-btn>
-    </q-input>
-    <q-input
-      v-model="activeUser.data.username"
-      :label="$t('username')"
-      filled
-      dense
-      class="q-mb-md"
-    >
-    </q-input>
-    <q-toggle
-      size="xs"
-      v-if="!activeUser.data.id"
-      color="secondary"
-      :label="$t('set_password')"
-      v-model="activeUser.setPassword"
-    >
-      <q-tooltip v-text="$t('set_password_tooltip')"></q-tooltip>
-    </q-toggle>
-
-    <q-input
-      v-if="activeUser.setPassword"
-      v-model="activeUser.data.password"
-      :type="activeUser.data.showPassword ? 'text': 'password'"
-      autocomplete="off"
-      :label="$t('password')"
-      filled
-      dense
-      :rules="[(val) => !val || val.length >= 8 || $t('invalid_password')]"
-    >
-      <q-btn
-        @click="activeUser.data.showPassword = !activeUser.data.showPassword"
-        dense
-        flat
-        :icon="activeUser.data.showPassword ? 'visibility_off' : 'visibility'"
-        color="grey"
-      ></q-btn>
-    </q-input>
-    <q-input
-      v-if="activeUser.setPassword"
-      v-model="activeUser.data.password_repeat"
-      :type="activeUser.data.showPassword ? 'text': 'password'"
-      type="password"
-      autocomplete="off"
-      :label="$t('password_repeat')"
-      filled
-      dense
-      class="q-mb-md"
-      :rules="[(val) => !val || val.length >= 8 || $t('invalid_password')]"
-    >
-      <q-btn
-        @click="activeUser.data.showPassword = !activeUser.data.showPassword"
-        dense
-        flat
-        :icon="activeUser.data.showPassword ? 'visibility_off' : 'visibility'"
-        color="grey"
-      ></q-btn>
-    </q-input>
-
-    <q-input
-      v-model="activeUser.data.pubkey"
-      :label="'Nostr '+ $t('pubkey')"
-      filled
-      dense
-      class="q-mb-md"
-    >
-      <q-tooltip v-text="$t('nostr_pubkey_tooltip')"></q-tooltip>
-    </q-input>
-    <q-input
-      v-model="activeUser.data.email"
-      :label="$t('email')"
-      filled
-      dense
-      class="q-mb-md"
-    >
-    </q-input>
-  </q-card-section>
-
-  <q-card-section v-if="activeUser.data.extra">
-    <q-input
-      v-model="activeUser.data.extra.first_name"
-      :label="$t('first_name')"
-      filled
-      dense
-      class="q-mb-md"
-    >
-    </q-input>
-    <q-input
-      v-model="activeUser.data.extra.last_name"
-      :label="$t('last_name')"
-      filled
-      dense
-      class="q-mb-md"
-    >
-    </q-input>
-    <q-input
-      v-model="activeUser.data.extra.provider"
-      :label="$t('auth_provider')"
-      filled
-      dense
-      class="q-mb-md"
-    >
-    </q-input>
-    <q-input
-      v-model="activeUser.data.external_id"
-      :label="$t('external_id')"
-      filled
-      dense
-      class="q-mb-md"
-    >
-    </q-input>
-    <q-input
-      v-model="activeUser.data.extra.picture"
-      :label="$t('picture')"
-      filled
-      dense
-      class="q-mb-md"
-    >
-    </q-input>
-    <q-select
-      filled
-      dense
-      v-model="activeUser.data.extensions"
-      multiple
-      label="User extensions"
-      :options="g.extensions"
-    ></q-select>
-  </q-card-section>
-  <q-card-section v-if="activeUser.data.id">
-    <q-btn
-      @click="resetPassword(activeUser.data.id)"
-      :disable="activeUser.data.is_super_user"
-      :label="$t('reset_password')"
-      icon="refresh"
-      color="primary"
-    >
-      <q-tooltip>Generate and copy password reset url</q-tooltip>
-    </q-btn>
-    <q-btn
-      @click="deleteUser(activeUser.data.id)"
-      :disable="activeUser.data.is_super_user"
-      :label="$t('delete')"
-      icon="delete"
-      color="negative"
-      class="float-right"
-    >
-      <q-tooltip>Delete User</q-tooltip></q-btn
-    >
-  </q-card-section>
-</q-card>
@@ -1,190 +0,0 @@
-<div v-if="paymentPage.show">
-  <div class="row q-mb-lg">
-    <div class="col">
-      <q-btn
-        icon="arrow_back_ios"
-        @click="paymentPage.show = false"
-        :label="$t('back')"
-      ></q-btn>
-    </div>
-  </div>
-  <q-card class="q-pa-md">
-    <q-card-section>
-      <payment-list :wallet="paymentsWallet" />
-    </q-card-section>
-  </q-card>
-</div>
-<div v-else-if="activeWallet.show">
-  <div class="row q-col-gutter-md q-mb-md">
-    <div class="col-12">
-      <q-card>
-        <div class="q-pa-sm">
-          <div class="row">
-            <div class="q-pa-xs">
-              <q-btn
-                icon="arrow_back_ios"
-                @click="backToUsersPage()"
-                :label="$t('back')"
-              ></q-btn>
-            </div>
-            <div class="q-pa-xs">
-              <q-btn
-                @click="createWalletDialog.show = true"
-                :label="$t('create_new_wallet')"
-                color="primary"
-              ></q-btn>
-            </div>
-            <div class="q-pa-xs">
-              <q-btn
-                @click="deleteAllUserWallets(activeWallet.userId)"
-                :label="$t('delete_all_wallets')"
-                icon="delete"
-                color="negative"
-              ></q-btn>
-            </div>
-          </div>
-        </div>
-      </q-card>
-    </div>
-  </div>
-  <q-card class="q-pa-md">
-    <h2 class="text-h6 q-mb-md">Wallets</h2>
-    <q-table :rows="wallets" :columns="walletTable.columns">
-      <template v-slot:header="props">
-        <q-tr :props="props">
-          <q-th auto-width v-if="g.user.super_user"></q-th>
-          <q-th auto-width></q-th>
-          <q-th
-            auto-width
-            v-for="col in props.cols"
-            v-text="col.label"
-            :key="col.name"
-            :props="props"
-          ></q-th>
-        </q-tr>
-      </template>
-      <template v-slot:body="props">
-        <q-tr :props="props">
-          <q-td auto-width v-if="g.user.super_user">
-            <lnbits-update-balance
-              :wallet_id="props.row.id"
-              @credit-value="handleBalanceUpdate"
-              class="q-mr-md"
-            ></lnbits-update-balance>
-          </q-td>
-          <q-td auto-width>
-            <q-btn
-              round
-              icon="menu"
-              size="sm"
-              color="secondary"
-              @click="showPayments(props.row.id)"
-            >
-              <q-tooltip>Show Payments</q-tooltip>
-            </q-btn>
-
-            <q-btn
-              round
-              v-if="!props.row.deleted"
-              icon="vpn_key"
-              size="sm"
-              color="primary"
-              class="q-ml-xs"
-              @click="copyText(props.row.adminkey)"
-            >
-              <q-tooltip>Copy Admin Key</q-tooltip>
-            </q-btn>
-            <q-btn
-              round
-              v-if="!props.row.deleted"
-              icon="vpn_key"
-              size="sm"
-              color="secondary"
-              class="q-ml-xs"
-              @click="copyText(props.row.inkey)"
-            >
-              <q-tooltip>Copy Invoice Key</q-tooltip>
-            </q-btn>
-
-            <q-btn
-              round
-              icon="delete"
-              size="sm"
-              color="negative"
-              class="q-ml-xs"
-              @click="deleteUserWallet(props.row.user, props.row.id, props.row.deleted)"
-            >
-              <q-tooltip>Delete Wallet</q-tooltip>
-            </q-btn>
-            <q-btn
-              round
-              v-if="props.row.deleted"
-              icon="toggle_off"
-              size="sm"
-              color="secondary"
-              class="q-ml-xs"
-              @click="undeleteUserWallet(props.row.user, props.row.id)"
-            >
-              <q-tooltip>Undelete Wallet</q-tooltip>
-            </q-btn>
-            <q-btn
-              icon="link"
-              size="sm"
-              flat
-              class="cursor-pointer q-mr-xs"
-              @click="copyWalletLink(props.row.id)"
-            >
-              <q-tooltip>Copy Wallet Link</q-tooltip>
-            </q-btn>
-          </q-td>
-          <q-td auto-width>
-            <span
-              v-text="props.row.name"
-              v-if="!props.row.editable"
-              :class="props.row.deleted ? 'text-strike' : 'cursor-pointer'"
-              @click="props.row.editable = true && !props.row.deleted"
-            ></span>
-            <q-input
-              v-else
-              @keydown.enter="updateWallet(props.row)"
-              v-model="props.row.name"
-              size="xs"
-              flat
-              dense
-            >
-              <template v-slot:append>
-                <q-btn
-                  @click="updateWallet(props.row)"
-                  round
-                  dense
-                  size="xs"
-                  flat
-                  icon="send"
-                />
-              </template>
-            </q-input>
-          </q-td>
-          <q-td auto-width>
-            <q-btn
-              icon="content_copy"
-              size="sm"
-              flat
-              class="cursor-pointer q-mr-xs"
-              @click="copyText(props.row.id)"
-            >
-              <q-tooltip>Copy Wallet ID</q-tooltip>
-            </q-btn>
-
-            <span
-              v-text="props.row.id"
-              :class="props.row.deleted ? 'text-strike' : ''"
-            ></span>
-          </q-td>
-
-          <q-td auto-width v-text="props.row.currency"></q-td>
-          <q-td auto-width v-text="formatSat(props.row.balance_msat)"></q-td>
-        </q-tr>
-      </template>
-    </q-table>
-  </q-card>
-</div>
@@ -1,186 +0,0 @@
-{% if not ajax %} {% extends "base.html" %} {% endif %}
-<!---->
-{% from "macros.jinja" import window_vars with context %}
-<!---->
-{% block scripts %} {{ window_vars(user) }}{% endblock %} {% block page %}
-
-<div class="row q-col-gutter-md justify-center">
-  <div class="col">
-    {% include "users/_manageWallet.html" %}
-    <div v-if="activeUser.show" class="row">
-      <div class="col-12 col-md-6">{%include "users/_manageUser.html" %}</div>
-    </div>
-    <div v-else-if="activeWallet.show">
-      {%include "users/_createWalletDialog.html" %}
-    </div>
-    <div v-else>
-      <div class="row q-col-gutter-md q-mb-md">
-        <div class="col-12">
-          <q-card>
-            <div class="q-pa-sm">
-              <div class="row items-center justify-between q-gutter-xs">
-                <div class="col">
-                  <q-btn
-                    @click="showAccountPage()"
-                    :label="$t('create_account')"
-                    color="primary"
-                  >
-                  </q-btn>
-                </div>
-                <div>
-                  <q-btn
-                    v-if="g.user.admin"
-                    flat
-                    round
-                    icon="settings"
-                    to="/admin#users"
-                  >
-                    <q-tooltip v-text="$t('admin_settings')"></q-tooltip>
-                  </q-btn>
-                </div>
-              </div>
-            </div>
-          </q-card>
-        </div>
-      </div>
-
-      <q-card class="q-pa-md">
-        <q-table
-          row-key="id"
-          :rows="users"
-          :columns="usersTable.columns"
-          v-model:pagination="usersTable.pagination"
-          :no-data-label="$t('no_users')"
-          :filter="usersTable.search"
-          :loading="usersTable.loading"
-          @request="fetchUsers"
-        >
-          <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">
-                <q-input
-                  v-if="['user', 'username', 'email', 'pubkey', 'wallet_id'].includes(col.name)"
-                  v-model="searchData[col.name]"
-                  @keydown.enter="searchUserBy(col.name)"
-                  dense
-                  type="text"
-                  filled
-                  :label="col.label"
-                >
-                  <template v-slot:append>
-                    <q-icon
-                      name="search"
-                      @click="searchUserBy(col.name)"
-                      class="cursor-pointer"
-                    />
-                  </template>
-                </q-input>
-
-                <span v-else v-text="col.label"></span>
-              </q-th>
-            </q-tr>
-          </template>
-          <template v-slot:body="props">
-            <q-tr auto-width :props="props">
-              <q-td>
-                <q-btn
-                  @click="showAccountPage(props.row.id)"
-                  round
-                  icon="edit"
-                  size="sm"
-                  color="secondary"
-                  class="q-ml-xs"
-                >
-                  <q-tooltip>
-                    <span v-text="$t('update_account')"></span>
-                  </q-tooltip>
-                </q-btn>
-              </q-td>
-              <q-td>
-                <q-toggle
-                  size="xs"
-                  v-if="!props.row.is_super_user"
-                  color="secondary"
-                  v-model="props.row.is_admin"
-                  @update:model-value="toggleAdmin(props.row.id)"
-                >
-                  <q-tooltip>Toggle Admin</q-tooltip>
-                </q-toggle>
-                <q-btn
-                  round
-                  v-if="props.row.is_super_user"
-                  icon="verified"
-                  size="sm"
-                  color="secondary"
-                  class="q-ml-xs"
-                >
-                  <q-tooltip>Super User</q-tooltip>
-                </q-btn>
-              </q-td>
-
-              <q-td>
-                <q-btn
-                  icon="list"
-                  size="sm"
-                  color="secondary"
-                  :label="props.row.wallet_count"
-                  @click="fetchWallets(props.row.id)"
-                >
-                </q-btn>
-                <q-btn
-                  v-if="(users.length == 1) && searchData.wallet_id"
-                  round
-                  icon="menu"
-                  size="sm"
-                  color="secondary"
-                  class="q-ml-sm"
-                  @click="showWalletPayments(searchData.wallet_id)"
-                >
-                  <q-tooltip>Show Payments</q-tooltip>
-                </q-btn>
-              </q-td>
-
-              <q-td>
-                <q-btn
-                  icon="content_copy"
-                  size="sm"
-                  flat
-                  class="cursor-pointer q-mr-xs"
-                  @click="copyText(props.row.id)"
-                >
-                  <q-tooltip>Copy User ID</q-tooltip>
-                </q-btn>
-                <span v-text="shortify(props.row.id)"></span>
-              </q-td>
-              <q-td v-text="props.row.username"></q-td>
-
-              <q-td v-text="props.row.email"></q-td>
-
-              <q-td>
-                <q-btn
-                  v-if="props.row.pubkey"
-                  icon="content_copy"
-                  size="sm"
-                  flat
-                  class="cursor-pointer q-mr-xs"
-                  @click="copyText(props.row.pubkey)"
-                >
-                  <q-tooltip>Copy Public Key</q-tooltip>
-                </q-btn>
-                <span v-text="shortify(props.row.pubkey)"></span>
-              </q-td>
-              <q-td v-text="formatSat(props.row.balance_msat)"></q-td>
-
-              <q-td v-text="props.row.transaction_count"></q-td>
-
-              <q-td v-text="formatDate(props.row.last_payment)"></q-td>
-            </q-tr>
-          </template>
-        </q-table>
-      </q-card>
-    </div>
-  </div>
-</div>
-
-{% endblock %}
@@ -1,20 +1,15 @@
 import os
 import time
 from http import HTTPStatus
-from pathlib import Path
-from shutil import make_archive, move
+from shutil import make_archive
 from subprocess import Popen
-from tempfile import NamedTemporaryFile
-from typing import IO
 from urllib.parse import urlparse

-import filetype
-from fastapi import APIRouter, Depends, File, Header, HTTPException, UploadFile
+from fastapi import APIRouter, Depends, File
 from fastapi.responses import FileResponse

-from lnbits.core.models import User
-from lnbits.core.models.misc import Image, SimpleStatus
 from lnbits.core.models.notifications import NotificationType
+from lnbits.core.models.users import Account
 from lnbits.core.services import (
    enqueue_admin_notification,
    get_balance_delta,
@@ -23,7 +18,6 @@ from lnbits.core.services import (
 from lnbits.core.services.notifications import send_email_notification
 from lnbits.core.services.settings import dict_to_settings
 from lnbits.decorators import check_admin, check_super_user
-from lnbits.helpers import safe_upload_file_path
 from lnbits.server import server_restart
 from lnbits.settings import AdminSettings, Settings, UpdateSettings, settings
 from lnbits.tasks import invoice_listeners
@@ -73,9 +67,9 @@ async def api_test_email():

@admin_router.get("/api/v1/settings")
 async def api_get_settings(
-    user: User = Depends(check_admin),
+    account: Account = Depends(check_admin),
 ) -> AdminSettings | None:
-    admin_settings = await get_admin_settings(user.super_user)
+    admin_settings = await get_admin_settings(account.is_super_user)
    return admin_settings


@@ -83,12 +77,14 @@ async def api_get_settings(
    "/api/v1/settings",
    status_code=HTTPStatus.OK,
 )
-async def api_update_settings(data: UpdateSettings, user: User = Depends(check_admin)):
+async def api_update_settings(
+    data: UpdateSettings, account: Account = Depends(check_admin)
+):
    enqueue_admin_notification(
-        NotificationType.settings_update, {"username": user.username}
+        NotificationType.settings_update, {"username": account.username}
    )
    await update_admin_settings(data)
-    admin_settings = await get_admin_settings(user.super_user)
+    admin_settings = await get_admin_settings(account.is_super_user)
    if not admin_settings:
        raise ValueError("Updated admin settings not found.")
    update_cached_settings(admin_settings.dict())
@@ -100,9 +96,11 @@ async def api_update_settings(data: UpdateSettings, user: User = Depends(check_a
    "/api/v1/settings",
    status_code=HTTPStatus.OK,
 )
-async def api_update_settings_partial(data: dict, user: User = Depends(check_admin)):
+async def api_update_settings_partial(
+    data: dict, account: Account = Depends(check_admin)
+):
    updatable_settings = dict_to_settings({**settings.dict(), **data})
-    return await api_update_settings(updatable_settings, user)
+    return await api_update_settings(updatable_settings, account)


@admin_router.get(
@@ -116,9 +114,9 @@ async def api_reset_settings(field_name: str):


@admin_router.delete("/api/v1/settings", status_code=HTTPStatus.OK)
-async def api_delete_settings(user: User = Depends(check_super_user)) -> None:
+async def api_delete_settings(account: Account = Depends(check_super_user)) -> None:
    enqueue_admin_notification(
-        NotificationType.settings_update, {"username": user.username}
+        NotificationType.settings_update, {"username": account.username}
    )
    await reset_core_settings()
    server_restart.set()
@@ -172,93 +170,3 @@ async def api_download_backup() -> FileResponse:
    return FileResponse(
        path=f"{last_filename}.zip", filename=filename, media_type="application/zip"
    )
-
-
-@admin_router.post(
-    "/api/v1/images",
-    status_code=HTTPStatus.OK,
-    dependencies=[Depends(check_admin)],
-)
-async def upload_image(
-    file: UploadFile = file_upload,
-    content_length: int = Header(..., le=settings.lnbits_upload_size_bytes),
-) -> Image:
-    if not file.filename:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST, detail="No filename provided."
-        )
-
-    # validate file types
-    file_info = filetype.guess(file.file)
-    if file_info is None:
-        raise HTTPException(
-            status_code=HTTPStatus.UNSUPPORTED_MEDIA_TYPE,
-            detail="Unable to determine file type",
-        )
-    detected_content_type = file_info.extension.lower()
-    if (
-        file.content_type not in settings.lnbits_upload_allowed_types
-        or detected_content_type not in settings.lnbits_upload_allowed_types
-    ):
-        raise HTTPException(HTTPStatus.UNSUPPORTED_MEDIA_TYPE, "Unsupported file type")
-
-    # validate file name
-    try:
-        file_path = safe_upload_file_path(file.filename)
-    except ValueError as e:
-        raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN,
-            detail=f"The requested filename '{file.filename}' is forbidden.",
-        ) from e
-
-    # validate file size
-    real_file_size = 0
-    temp: IO = NamedTemporaryFile(delete=False)
-    for chunk in file.file:
-        real_file_size += len(chunk)
-        if real_file_size > content_length:
-            raise HTTPException(
-                status_code=HTTPStatus.REQUEST_ENTITY_TOO_LARGE,
-                detail=f"File too large ({content_length / 1000} KB max)",
-            )
-        temp.write(chunk)
-    temp.close()
-
-    move(temp.name, file_path)
-    return Image(filename=file.filename)
-
-
-@admin_router.get(
-    "/api/v1/images",
-    status_code=HTTPStatus.OK,
-    dependencies=[Depends(check_admin)],
-)
-async def list_uploaded_images() -> list[Image]:
-    image_folder = Path(settings.lnbits_data_folder, "images")
-    files = image_folder.glob("*")
-    images = []
-    for file in files:
-        if file.is_file():
-            images.append(Image(filename=file.name))
-    return images
-
-
-@admin_router.delete(
-    "/api/v1/images/{filename}",
-    status_code=HTTPStatus.OK,
-    dependencies=[Depends(check_admin)],
-)
-async def delete_uploaded_image(filename: str) -> SimpleStatus:
-    try:
-        file_path = safe_upload_file_path(filename)
-    except ValueError as e:
-        raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN,
-            detail=f"The requested filename '{filename}' is forbidden.",
-        ) from e
-
-    if not file_path.exists():
-        raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail="Image not found.")
-
-    file_path.unlink()
-    return SimpleStatus(success=True, message=f"{filename} deleted")
@@ -8,13 +8,17 @@ from fastapi import APIRouter, Depends
 from fastapi.responses import StreamingResponse

 from lnbits.core.models import (
-    BaseWallet,
    ConversionData,
    CreateWallet,
    User,
    Wallet,
 )
-from lnbits.decorators import check_user_exists
+from lnbits.core.models.users import AccountId
+from lnbits.decorators import (
+    check_account_exists,
+    check_account_id_exists,
+    check_user_exists,
+)
 from lnbits.settings import settings
 from lnbits.utils.exchange_rates import (
    allowed_currencies,
@@ -39,7 +43,9 @@ async def health() -> dict:


@api_router.get("/api/v1/status", status_code=HTTPStatus.OK)
-async def health_check(user: User = Depends(check_user_exists)) -> dict:
+async def health_check(
+    account_id: AccountId = Depends(check_account_id_exists),
+) -> dict:
    stat: dict[str, Any] = {
        "server_time": int(time()),
        "up_time": settings.lnbits_server_up_time,
@@ -47,7 +53,7 @@ async def health_check(user: User = Depends(check_user_exists)) -> dict:
    }

    stat["version"] = settings.version
-    if not user.admin:
+    if not account_id.is_admin_id:
        return stat

    funding_source = get_funding_source()
@@ -64,7 +70,6 @@ async def health_check(user: User = Depends(check_user_exists)) -> dict:
    "/api/v1/wallets",
    name="Wallets",
    description="Get basic info for all of user's wallets.",
-    response_model=list[BaseWallet],
 )
 async def api_wallets(user: User = Depends(check_user_exists)) -> list[Wallet]:
    return user.wallets
@@ -78,7 +83,7 @@ async def api_create_account(data: CreateWallet) -> Wallet:

@api_router.get(
    "/api/v1/rate/history",
-    dependencies=[Depends(check_user_exists)],
+    dependencies=[Depends(check_account_exists)],
 )
 async def api_exchange_rate_history() -> list[dict]:
    return settings.lnbits_exchange_rate_history
@@ -0,0 +1,174 @@
+import base64
+from http import HTTPStatus
+
+from fastapi import APIRouter, Depends, File, HTTPException, Response, UploadFile
+
+from lnbits.core.crud.assets import (
+    delete_user_asset,
+    get_asset_info,
+    get_public_asset,
+    get_public_asset_info,
+    get_user_asset,
+    get_user_asset_info,
+    get_user_assets,
+    update_user_asset_info,
+)
+from lnbits.core.models.assets import AssetFilters, AssetInfo, AssetUpdate
+from lnbits.core.models.misc import SimpleStatus
+from lnbits.core.models.users import AccountId
+from lnbits.core.services.assets import create_user_asset
+from lnbits.db import Filters, Page
+from lnbits.decorators import (
+    check_account_id_exists,
+    optional_user_id,
+    parse_filters,
+)
+
+asset_router = APIRouter(prefix="/api/v1/assets", tags=["Assets"])
+
+upload_file_param = File(...)
+
+
+@asset_router.get(
+    "/paginated",
+    name="Get user assets",
+    summary="Get paginated list user assets",
+)
+async def api_get_user_assets(
+    account_id: AccountId = Depends(check_account_id_exists),
+    filters: Filters = Depends(parse_filters(AssetFilters)),
+) -> Page[AssetInfo]:
+    return await get_user_assets(account_id.id, filters=filters)
+
+
+@asset_router.get(
+    "/{asset_id}",
+    name="Get user asset",
+    summary="Get user asset by ID",
+)
+async def api_get_asset(
+    asset_id: str,
+    account_id: AccountId = Depends(check_account_id_exists),
+) -> AssetInfo:
+    asset_info = await get_user_asset_info(account_id.id, asset_id)
+    if not asset_info:
+        raise HTTPException(HTTPStatus.NOT_FOUND, "Asset not found.")
+    return asset_info
+
+
+@asset_router.get(
+    "/{asset_id}/data",
+    name="Get user asset data",
+    summary="Get user asset data data by ID",
+)
+async def api_get_asset_data(
+    asset_id: str,
+    user_id: str | None = Depends(optional_user_id),
+) -> Response:
+    asset = None
+    if user_id:
+        asset = await get_user_asset(user_id, asset_id)
+
+    if not asset:
+        asset = await get_public_asset(asset_id)
+
+    if not asset:
+        raise HTTPException(HTTPStatus.NOT_FOUND, "Asset not found.")
+
+    return Response(
+        content=asset.data,
+        media_type=asset.mime_type,
+        headers={"Content-Disposition": f'inline; filename="{asset.name}"'},
+    )
+
+
+@asset_router.get(
+    "/{asset_id}/thumbnail",
+    name="Get user asset thumbnail",
+    summary="Get user asset thumbnail data by ID",
+)
+async def api_get_asset_thumbnail(
+    asset_id: str,
+    user_id: str | None = Depends(optional_user_id),
+) -> Response:
+    asset_info = None
+    if user_id:
+        asset_info = await get_user_asset_info(user_id, asset_id)
+
+    if not asset_info:
+        asset_info = await get_public_asset_info(asset_id)
+
+    if not asset_info:
+        raise HTTPException(HTTPStatus.NOT_FOUND, "Asset not found.")
+
+    return Response(
+        content=(
+            base64.b64decode(asset_info.thumbnail_base64)
+            if asset_info.thumbnail_base64
+            else b""
+        ),
+        media_type=asset_info.mime_type,
+        headers={"Content-Disposition": f'inline; filename="{asset_info.name}"'},
+    )
+
+
+@asset_router.put(
+    "/{asset_id}",
+    name="Update user asset",
+    summary="Update user asset by ID",
+)
+async def api_update_asset(
+    asset_id: str,
+    data: AssetUpdate,
+    account_id: AccountId = Depends(check_account_id_exists),
+) -> AssetInfo:
+    if account_id.is_admin_id:
+        asset_info = await get_asset_info(asset_id)
+    else:
+        asset_info = await get_user_asset_info(account_id.id, asset_id)
+
+    if not asset_info:
+        raise HTTPException(HTTPStatus.NOT_FOUND, "Asset not found.")
+
+    asset_info.name = data.name or asset_info.name
+    asset_info.is_public = (
+        asset_info.is_public if data.is_public is None else data.is_public
+    )
+    await update_user_asset_info(asset_info)
+    return asset_info
+
+
+@asset_router.post(
+    "",
+    name="Upload",
+    summary="Upload user assets",
+)
+async def api_upload_asset(
+    account_id: AccountId = Depends(check_account_id_exists),
+    file: UploadFile = upload_file_param,
+    public_asset: bool = False,
+) -> AssetInfo:
+    asset = await create_user_asset(account_id.id, file, public_asset)
+
+    asset_info = await get_user_asset_info(account_id.id, asset.id)
+    if not asset_info:
+        raise ValueError("Failed to retrieve asset info after upload.")
+
+    return asset_info
+
+
+@asset_router.delete(
+    "/{asset_id}",
+    name="Delete user asset",
+    summary="Delete user asset by ID",
+)
+async def api_delete_asset(
+    asset_id: str,
+    account_id: AccountId = Depends(check_account_id_exists),
+) -> SimpleStatus:
+    asset = await get_user_asset(account_id.id, asset_id)
+    if not asset:
+        raise HTTPException(HTTPStatus.NOT_FOUND, "Asset not found.")
+
+    await delete_user_asset(account_id.id, asset_id)
+    return SimpleStatus(success=True, message="Asset deleted successfully.")
@@ -4,9 +4,10 @@ import json
 from collections.abc import Callable
 from http import HTTPStatus
 from time import time
+from typing import Annotated
 from uuid import uuid4

-from fastapi import APIRouter, Depends, HTTPException, Request
+from fastapi import APIRouter, Cookie, Depends, HTTPException, Request
 from fastapi.responses import JSONResponse, RedirectResponse
 from fastapi_sso.sso.base import OpenID, SSOBase
 from loguru import logger
@@ -25,7 +26,16 @@ from lnbits.core.models.users import (
    UpdateAccessControlList,
 )
 from lnbits.core.services import create_user_account
-from lnbits.decorators import access_token_payload, check_user_exists
+from lnbits.core.services.users import (
+    check_register_activation_settings,
+    update_user_account,
+)
+from lnbits.decorators import (
+    access_token_payload,
+    check_account_exists,
+    check_admin,
+    check_user_exists,
+)
 from lnbits.helpers import (
    create_access_token,
    decrypt_internal_message,
@@ -79,6 +89,7 @@ async def login(data: LoginUsernamePassword) -> JSONResponse:
    account = await get_account_by_username_or_email(data.username)
    if not account or not account.verify_password(data.password):
        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid credentials.")
+
    return _auth_success_response(account.username, account.id, account.email)


@@ -87,7 +98,7 @@ async def nostr_login(request: Request) -> JSONResponse:
    if not settings.is_auth_method_allowed(AuthMethods.nostr_auth_nip98):
        raise HTTPException(HTTPStatus.FORBIDDEN, "Login with Nostr Auth not allowed.")
    event = _nostr_nip98_event(request)
-    account = await get_account_by_pubkey(event["pubkey"])
+    account = await get_account_by_pubkey(event["pubkey"], active_only=False)
    if not account:
        account = Account(
            id=uuid4().hex,
@@ -95,6 +106,8 @@ async def nostr_login(request: Request) -> JSONResponse:
            extra=UserExtra(provider="nostr"),
        )
        await create_user_account(account)
+    if not account.activated:
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "User is not activated.")
    return _auth_success_response(account.username or "", account.id, account.email)


@@ -115,14 +128,71 @@ async def login_usr(data: LoginUsr) -> JSONResponse:
    return _auth_success_response(account.username, account.id, account.email)


+@auth_router.post("/impersonate", description="Login via the User ID of another user")
+async def impersonate_user(
+    data: LoginUsr,
+    user: User = Depends(check_admin),
+    cookie_access_token: Annotated[str | None, Cookie()] = None,
+) -> JSONResponse:
+    if not cookie_access_token:
+        raise HTTPException(
+            HTTPStatus.UNAUTHORIZED, "Only cookie based impersonation is allowed."
+        )
+    if data.usr == user.id:
+        raise HTTPException(HTTPStatus.FORBIDDEN, "You cannot impersonate yourself.")
+    if settings.is_admin_user(data.usr):
+        # this check includes the superuser
+        raise HTTPException(
+            HTTPStatus.FORBIDDEN, "You cannot impersonate another admin user."
+        )
+
+    account = await get_account(data.usr)
+    if not account:
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "User ID does not exist.")
+
+    response = _auth_success_response(account.username, account.id, account.email)
+
+    max_age = settings.auth_token_expire_minutes * 60
+    response.set_cookie(
+        "admin_access_token", cookie_access_token, httponly=True, max_age=max_age
+    )
+    response.set_cookie("is_lnbits_user_impersonated", "true", max_age=max_age)
+    return response
+
+
+@auth_router.delete(
+    "/impersonate", description="Stop impersonation and go back to admin"
+)
+async def stop_impersonate_user(
+    user: User = Depends(check_user_exists),
+    admin_access_token: Annotated[str | None, Cookie()] = None,
+) -> JSONResponse:
+    if not admin_access_token:
+        raise HTTPException(
+            HTTPStatus.UNAUTHORIZED,
+            "No admin access token found to stop impersonation.",
+        )
+    response = JSONResponse(
+        {"access_token": admin_access_token, "token_type": "bearer"}
+    )
+    max_age = settings.auth_token_expire_minutes * 60
+    response.set_cookie(
+        "cookie_access_token", admin_access_token, httponly=True, max_age=max_age
+    )
+    response.delete_cookie("admin_access_token")
+    response.delete_cookie("is_access_token_expired")
+    response.delete_cookie("is_lnbits_user_impersonated")
+    return response
+
+
@auth_router.get("/acl")
 async def api_get_user_acls(
    request: Request,
-    user: User = Depends(check_user_exists),
+    account: Account = Depends(check_account_exists),
 ) -> UserAcls:
    api_routes = get_api_routes(request.app.router.routes)

-    acls = await get_user_access_control_lists(user.id)
+    acls = await get_user_access_control_lists(account.id)

    # Add missing/new endpoints to the ACLs
    for acl in acls.access_control_list:
@@ -135,7 +205,7 @@ async def api_get_user_acls(
            acl.endpoints.append(EndpointAccess(path=path, name=name))
        acl.endpoints.sort(key=lambda e: e.name.lower())

-    return UserAcls(id=user.id, access_control_list=acls.access_control_list)
+    return UserAcls(id=account.id, access_control_list=acls.access_control_list)


@auth_router.put("/acl")
@@ -143,13 +213,13 @@ async def api_get_user_acls(
 async def api_update_user_acl(
    request: Request,
    data: UpdateAccessControlList,
-    user: User = Depends(check_user_exists),
+    account: Account = Depends(check_account_exists),
 ) -> UserAcls:
-    account = await get_account(user.id)
+
    if not account or not account.verify_password(data.password):
        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid credentials.")

-    user_acls = await get_user_access_control_lists(user.id)
+    user_acls = await get_user_access_control_lists(account.id)
    acl = user_acls.get_acl_by_id(data.id)
    if acl:
        user_acls.access_control_list.remove(acl)
@@ -174,33 +244,30 @@ async def api_update_user_acl(

@auth_router.delete("/acl")
 async def api_delete_user_acl(
-    data: DeleteAccessControlList,
-    user: User = Depends(check_user_exists),
+    data: DeleteAccessControlList, account: Account = Depends(check_account_exists)
 ):
-    account = await get_account(user.id)
    if not account or not account.verify_password(data.password):
        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid credentials.")

-    user_acls = await get_user_access_control_lists(user.id)
+    user_acls = await get_user_access_control_lists(account.id)
    user_acls.delete_acl_by_id(data.id)
    await update_user_access_control_list(user_acls)


@auth_router.post("/acl/token")
 async def api_create_user_api_token(
-    data: ApiTokenRequest,
-    user: User = Depends(check_user_exists),
+    data: ApiTokenRequest, account: Account = Depends(check_account_exists)
 ) -> ApiTokenResponse:
    if not data.expiration_time_minutes > 0:
        raise ValueError("Expiration time must be in the future.")
-    account = await get_account(user.id)
+
    if not account or not account.verify_password(data.password):
        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid credentials.")

    if not account.username:
        raise ValueError("Username must be configured.")

-    acls = await get_user_access_control_lists(user.id)
+    acls = await get_user_access_control_lists(account.id)
    acl = acls.get_acl_by_id(data.acl_id)
    if not acl:
        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid ACL id.")
@@ -217,18 +284,16 @@ async def api_create_user_api_token(

@auth_router.delete("/acl/token")
 async def api_delete_user_api_token(
-    data: DeleteTokenRequest,
-    user: User = Depends(check_user_exists),
+    data: DeleteTokenRequest, account: Account = Depends(check_account_exists)
 ):

-    account = await get_account(user.id)
    if not account or not account.verify_password(data.password):
        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid credentials.")

    if not account.username:
        raise ValueError("Username must be configured.")

-    acls = await get_user_access_control_lists(user.id)
+    acls = await get_user_access_control_lists(account.id)
    acl = acls.get_acl_by_id(data.acl_id)
    if not acl:
        raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid ACL id.")
@@ -298,12 +363,14 @@ async def register(data: RegisterUser) -> JSONResponse:
    if not is_valid_username(data.username):
        raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid username.")

-    if await get_account_by_username(data.username):
+    if await get_account_by_username(data.username, active_only=False):
        raise HTTPException(HTTPStatus.BAD_REQUEST, "Username already exists.")

    if data.email and not is_valid_email_address(data.email):
        raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid email.")

+    await check_register_activation_settings(data)
+
    account = Account(
        id=uuid4().hex,
        email=data.email,
@@ -317,24 +384,20 @@ async def register(data: RegisterUser) -> JSONResponse:
@auth_router.put("/pubkey")
 async def update_pubkey(
    data: UpdateUserPubkey,
-    user: User = Depends(check_user_exists),
+    account: Account = Depends(check_account_exists),
    payload: AccessTokenPayload = Depends(access_token_payload),
 ) -> User | None:
-    if data.user_id != user.id:
+    if data.user_id != account.id:
        raise ValueError("Invalid user ID.")

    _validate_auth_timeout(payload.auth_time)
    if (
        data.pubkey
-        and data.pubkey != user.pubkey
+        and data.pubkey != account.pubkey
        and await get_account_by_pubkey(data.pubkey)
    ):
        raise ValueError("Public key already in use.")

-    account = await get_account(user.id)
-    if not account:
-        raise HTTPException(HTTPStatus.NOT_FOUND, "Account not found.")
-
    account.pubkey = normalize_public_key(data.pubkey)
    await update_account(account)
    return await get_user_from_account(account)
@@ -343,23 +406,19 @@ async def update_pubkey(
@auth_router.put("/password")
 async def update_password(
    data: UpdateUserPassword,
-    user: User = Depends(check_user_exists),
+    account: Account = Depends(check_account_exists),
    payload: AccessTokenPayload = Depends(access_token_payload),
 ) -> User | None:
    _validate_auth_timeout(payload.auth_time)
-    if data.user_id != user.id:
+    if data.user_id != account.id:
        raise ValueError("Invalid user ID.")
    if (
        data.username
-        and user.username != data.username
+        and account.username != data.username
        and await get_account_by_username(data.username)
    ):
        raise HTTPException(HTTPStatus.BAD_REQUEST, "Username already exists.")

-    account = await get_account(user.id)
-    if not account:
-        raise ValueError("Account not found.")
-
    # old accounts do not have a password
    if account.password_hash:
        if not data.password_old:
@@ -416,42 +475,57 @@ async def reset_password(data: ResetUserPassword) -> JSONResponse:
    return _auth_success_response(account.username, user_id, account.email)


-@auth_router.put("/update")
+@auth_router.patch("")
 async def update(
-    data: UpdateUser, user: User = Depends(check_user_exists)
+    data: UpdateUser, account: Account = Depends(check_account_exists)
 ) -> User | None:
-    if data.user_id != user.id:
+    if data.user_id != account.id:
        raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid user ID.")
-    if data.username and not is_valid_username(data.username):
-        raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid username.")
-
-    if (
-        data.username
-        and user.username != data.username
-        and await get_account_by_username(data.username)
-    ):
-        raise HTTPException(HTTPStatus.BAD_REQUEST, "Username already exists.")
-
-    account = await get_account(user.id)
-    if not account:
-        raise HTTPException(HTTPStatus.NOT_FOUND, "Account not found.")

    if data.username:
        account.username = data.username
    if data.extra:
        account.extra = data.extra

-    await update_account(account)
+    await update_user_account(account)
    return await get_user_from_account(account)


+@auth_router.patch("/ui")
+async def update_ui_customization(
+    req: Request, account: Account = Depends(check_account_exists)
+) -> Account:
+    ui_customization = await req.json()
+    account.ui_customization = {**(account.ui_customization or {}), **ui_customization}
+
+    if len(account.ui_customization or {}) > 1000 * 1024:
+        raise HTTPException(
+            HTTPStatus.BAD_REQUEST, "UI customization too large. Drop some fields."
+        )
+
+    await update_user_account(account)
+    return account
+
+
@auth_router.put("/first_install")
 async def first_install(data: UpdateSuperuserPassword) -> JSONResponse:
    if not settings.first_install:
        raise HTTPException(HTTPStatus.FORBIDDEN, "This is not your first install")
+
+    if settings.first_install_token:
+        if not data.first_install_token:
+            raise HTTPException(HTTPStatus.UNAUTHORIZED, "Missing first_install_token.")
+        if settings.first_install_token != data.first_install_token:
+            raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid first_install_token.")
+
+    account = await get_account_by_username(data.username, False)
+    if account:
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Username already exists.")
+
    account = await get_account(settings.super_user)
    if not account:
        raise HTTPException(HTTPStatus.INTERNAL_SERVER_ERROR, "Superuser not found.")
+
    account.username = data.username
    account.extra = account.extra or UserExtra()
    account.extra.provider = "lnbits"
@@ -467,7 +541,7 @@ async def _handle_sso_login(userinfo: OpenID, verified_user_id: str | None = Non
        raise HTTPException(HTTPStatus.BAD_REQUEST, "Invalid email.")

    redirect_path = "/wallet"
-    account = await get_account_by_email(email)
+    account = await get_account_by_email(email, active_only=False)

    if verified_user_id:
        if account:
@@ -9,7 +9,9 @@ from lnbits.core.crud.payments import (
 from lnbits.core.models.misc import SimpleStatus
 from lnbits.core.models.payments import CreateInvoice
 from lnbits.core.services.fiat_providers import (
+    check_fiat_status,
    check_stripe_signature,
+    verify_paypal_webhook,
 )
 from lnbits.core.services.payments import create_fiat_invoice
 from lnbits.fiat.base import FiatSubscriptionPaymentOptions
@@ -22,7 +24,7 @@ callback_router = APIRouter(prefix="/api/v1/callback", tags=["callback"])
 async def api_generic_webhook_handler(
    provider_name: str, request: Request
 ) -> SimpleStatus:
-
+    logger.info(f"Received callback from provider: '{provider_name}'.")
    if provider_name.lower() == "stripe":
        payload = await request.body()
        sig_header = request.headers.get("Stripe-Signature")
@@ -37,6 +39,17 @@ async def api_generic_webhook_handler(
            message=f"Callback received successfully from '{provider_name}'.",
        )

+    if provider_name.lower() == "paypal":
+        payload = await request.body()
+        await verify_paypal_webhook(request.headers, payload)
+        event = await request.json()
+        await handle_paypal_event(event)
+
+        return SimpleStatus(
+            success=True,
+            message=f"Callback received successfully from '{provider_name}'.",
+        )
+
    return SimpleStatus(
        success=False,
        message=f"Unknown fiat provider '{provider_name}'.",
@@ -48,6 +61,8 @@ async def handle_stripe_event(event: dict):
    event_type = event.get("type")
    if event_type == "checkout.session.completed":
        await _handle_stripe_checkout_session_completed(event)
+    elif event_type == "payment_intent.succeeded":
+        await _handle_stripe_intent_session_completed(event)
    elif event_type == "invoice.paid":
        await _handle_stripe_subscription_invoice_paid(event)
    else:
@@ -56,18 +71,38 @@ async def handle_stripe_event(event: dict):
        )


+async def _handle_stripe_intent_session_completed(event: dict):
+    event_id = event.get("id")
+    event_object = event.get("data", {}).get("object", {})
+    object_type = event_object.get("object")
+    payment_hash = event_object.get("metadata", {}).get("payment_hash")
+    logger.debug(
+        f"Handling Stripe event: '{event_id}'. Type: '{object_type}'."
+        f" Payment hash: '{payment_hash}'."
+    )
+    if not payment_hash:
+        logger.warning("Stripe event does not contain a payment hash.")
+        return
+
+    payment = await get_standalone_payment(payment_hash)
+    if not payment:
+        logger.warning(f"No payment found for hash: '{payment_hash}'.")
+        return
+    await check_fiat_status(payment)
+
+
 async def _handle_stripe_checkout_session_completed(event: dict):
    event_id = event.get("id")
    event_object = event.get("data", {}).get("object", {})
    object_type = event_object.get("object")
    payment_hash = event_object.get("metadata", {}).get("payment_hash")
-    lnbits_action = event_object.get("metadata", {}).get("lnbits_action")
+    alan_action = event_object.get("metadata", {}).get("alan_action")
    logger.debug(
        f"Handling Stripe event: '{event_id}'. Type: '{object_type}'."
        f" Payment hash: '{payment_hash}'."
    )
-    if lnbits_action != "invoice":
-        logger.warning(f"Stripe event is not an invoice: '{lnbits_action}'.")
+    if alan_action != "invoice":
+        logger.warning(f"Stripe event is not an invoice: '{alan_action}'.")
        return

    if not payment_hash:
@@ -76,7 +111,7 @@ async def _handle_stripe_checkout_session_completed(event: dict):
    payment = await get_standalone_payment(payment_hash)
    if not payment:
        raise ValueError(f"No payment found for hash: '{payment_hash}'.")
-    await payment.check_fiat_status()
+    await check_fiat_status(payment)


 async def _handle_stripe_subscription_invoice_paid(event: dict):
@@ -121,7 +156,7 @@ async def _handle_stripe_subscription_invoice_paid(event: dict):
        ),
    )

-    await payment.check_fiat_status()
+    await check_fiat_status(payment)


 async def _get_stripe_subscription_payment_options(
@@ -132,7 +167,7 @@ async def _get_stripe_subscription_payment_options(

    metadata = parent.get("subscription_details", {}).get("metadata", {})

-    if metadata.get("lnbits_action") != "subscription":
+    if metadata.get("alan_action") != "subscription":
        raise ValueError("Stripe invoice.paid metadata action is not 'subscription'.")

    if "extra" in metadata:
@@ -143,3 +178,105 @@ async def _get_stripe_subscription_payment_options(
            metadata["extra"] = {}

    return FiatSubscriptionPaymentOptions(**metadata)
+
+
+async def handle_paypal_event(event: dict):
+    event_id = event.get("id", "")
+    event_type = event.get("event_type", "")
+    resource = event.get("resource", {})
+    logger.info(f"Handling PayPal event: '{event_id}'. Type: '{event_type}'.")
+
+    if event_type in ("CHECKOUT.ORDER.APPROVED", "PAYMENT.CAPTURE.COMPLETED"):
+        payment_hash = _paypal_extract_payment_hash(resource)
+        if not payment_hash:
+            logger.warning("PayPal event missing payment hash.")
+            return
+        payment = await get_standalone_payment(payment_hash)
+        if not payment:
+            logger.warning(f"No payment found for hash: '{payment_hash}'.")
+            return
+        await check_fiat_status(payment)
+        return
+
+    if event_type in ("PAYMENT.SALE.COMPLETED"):
+        await _handle_paypal_subscription_payment(resource)
+        return
+
+    logger.warning(f"Unhandled PayPal event type: '{event_type}'.")
+
+
+async def _handle_paypal_subscription_payment(resource: dict):
+    amount_info = resource.get("amount") or {}
+    currency = (amount_info.get("currency") or "").upper()
+    total = amount_info.get("total")
+    if not currency or total is None:
+        raise ValueError("PayPal subscription event missing amount.")
+
+    custom_id = resource.get("custom_id") or resource.get("custom")
+    if not custom_id:
+        raise ValueError("PayPal subscription event missing custom metadata.")
+
+    payment_options = _deserialize_paypal_metadata(custom_id)
+    if not payment_options.wallet_id:
+        raise ValueError("PayPal subscription event missing wallet_id.")
+
+    memo = payment_options.memo or ""
+    extra = {
+        **(payment_options.extra or {}),
+        "subscription_request_id": resource.get("billing_agreement_id"),
+        "fiat_method": "subscription",
+        "tag": payment_options.tag,
+        "subscription": {
+            "checking_id": resource.get("id") or resource.get("billing_agreement_id"),
+            "payment_request": "",
+        },
+    }
+
+    payment = await create_fiat_invoice(
+        wallet_id=payment_options.wallet_id,
+        invoice_data=CreateInvoice(
+            unit=currency,
+            amount=float(total),
+            memo=memo,
+            extra=extra,
+            fiat_provider="paypal",
+        ),
+    )
+
+    await check_fiat_status(payment)
+
+
+def _paypal_extract_payment_hash(resource: dict) -> str | None:
+    purchase_units = resource.get("purchase_units") or []
+    for pu in purchase_units:
+        if pu.get("invoice_id"):
+            return pu.get("invoice_id")
+        if pu.get("custom_id"):
+            return pu.get("custom_id")
+    return None
+
+
+def _deserialize_paypal_metadata(custom_id: str) -> FiatSubscriptionPaymentOptions:
+    try:
+        meta = json.loads(custom_id)
+        wallet_id = meta[0] if len(meta) > 0 else None
+        tag = meta[1] if len(meta) > 1 else None
+        subscription_request_id = meta[2] if len(meta) > 2 else None
+        extra_link = meta[3] if len(meta) > 3 else None
+        memo = meta[4] if len(meta) > 4 else None
+
+        extra = {
+            "link": extra_link,
+            "subscription_request_id": subscription_request_id,
+        }
+
+        return FiatSubscriptionPaymentOptions(
+            wallet_id=wallet_id,
+            tag=tag,
+            subscription_request_id=subscription_request_id,
+            extra=extra,
+            memo=memo,
+        )
+    except (json.JSONDecodeError, IndexError) as e:
+        logger.warning(f"Failed to deserialize PayPal metadata: {e}")
+        return FiatSubscriptionPaymentOptions()
@@ -1,28 +1,41 @@
+import json
 import sys
 import traceback
 from http import HTTPStatus
+from pathlib import Path

+import httpx
 from bolt11 import decode as bolt11_decode
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, Body, Depends, HTTPException
+from fastapi.requests import Request
 from loguru import logger
+from starlette.routing import Match

 from lnbits.core.crud.extensions import get_user_extensions
+from lnbits.core.crud.wallets import get_wallets_ids
+from lnbits.core.db import db
 from lnbits.core.models import (
    SimpleStatus,
-    User,
 )
 from lnbits.core.models.extensions import (
    CreateExtension,
+    CreateExtensionReview,
    Extension,
    ExtensionConfig,
    ExtensionMeta,
+    ExtensionPermission,
+    ExtensionPermissionsGrant,
    ExtensionRelease,
+    ExtensionReview,
+    ExtensionReviewPaymentRequest,
+    ExtensionReviewsStatus,
    InstallableExtension,
    PayToEnableInfo,
    ReleasePaymentInfo,
    UserExtension,
    UserExtensionInfo,
 )
+from lnbits.core.models.users import Account, AccountId
 from lnbits.core.services import check_transaction_status, create_invoice
 from lnbits.core.services.extensions import (
    activate_extension,
@@ -32,16 +45,25 @@ from lnbits.core.services.extensions import (
    install_extension,
    uninstall_extension,
 )
-from lnbits.decorators import (
-    check_admin,
-    check_user_exists,
+from lnbits.core.wasm import WASM_HOST_MANIFEST
+from lnbits.core.wasm.extension_host import (
+    clear_schedules_for_user,
+    clear_tag_watches_for_user,
 )
+from lnbits.db import Page
+from lnbits.decorators import (
+    check_account_exists,
+    check_account_id_exists,
+    check_admin,
+)
+from lnbits.settings import settings

 from ..crud import (
    create_user_extension,
    delete_dbversion,
    drop_extension_db,
    get_db_version,
+    get_db_versions,
    get_installed_extension,
    get_installed_extensions,
    get_user_extension,
@@ -140,9 +162,10 @@ async def api_extension_details(
 async def api_update_pay_to_enable(
    ext_id: str,
    data: PayToEnableInfo,
-    user: User = Depends(check_admin),
+    account: Account = Depends(check_admin),
 ) -> SimpleStatus:
-    if data.wallet not in user.wallet_ids:
+    user_wallet_ids = await get_wallets_ids(account.id, deleted=False)
+    if data.wallet not in user_wallet_ids:
        raise HTTPException(
            HTTPStatus.BAD_REQUEST, "Wallet does not belong to this admin user."
        )
@@ -161,38 +184,146 @@ async def api_update_pay_to_enable(

@extension_router.put("/{ext_id}/enable")
 async def api_enable_extension(
-    ext_id: str, user: User = Depends(check_user_exists)
+    ext_id: str,
+    request: Request,
+    account_id: AccountId = Depends(check_account_id_exists),
+    grant: ExtensionPermissionsGrant | None = Body(default=None),
 ) -> SimpleStatus:
+    await _ensure_extension_exists(ext_id)
+    logger.info(f"Enabling extension: {ext_id}.")
+
+    ext = await _get_installed_active_extension(ext_id)
+    user_ext = await _get_or_create_user_extension(account_id.id, ext_id)
+
+    required_permissions = _get_required_permissions(ext_id, ext)
+    granted_permissions = _get_granted_permissions(grant, user_ext)
+    granted_tags = _get_granted_payment_tags(grant, user_ext)
+    required_tags = _get_required_payment_tags(ext_id, ext)
+    if _is_wasm_extension(ext_id, ext):
+        _ensure_api_permissions_available(
+            request, _merge_permissions(required_permissions, granted_permissions)
+        )
+        _ensure_payment_tags_allowed(required_tags, granted_tags)
+    _ensure_permissions(required_permissions, granted_permissions)
+
+    if grant and grant.permissions:
+        await _store_granted_permissions(user_ext, granted_permissions)
+    if grant and grant.payment_tags:
+        await _store_granted_payment_tags(user_ext, granted_tags)
+
+    if account_id.is_admin_id or not ext.requires_payment:
+        await _activate_user_extension(user_ext)
+        return SimpleStatus(success=True, message=f"Extension '{ext_id}' enabled.")
+
+    return await _enable_paid_extension(ext_id, ext, user_ext)
+
+
+async def _ensure_extension_exists(ext_id: str) -> None:
    if ext_id not in [e.code for e in await get_valid_extensions()]:
        raise HTTPException(
            HTTPStatus.NOT_FOUND, f"Extension '{ext_id}' doesn't exist."
        )

-    logger.info(f"Enabling extension: {ext_id}.")
+
+async def _get_installed_active_extension(ext_id: str) -> InstallableExtension:
    ext = await get_installed_extension(ext_id)
    if not ext:
        raise ValueError(f"Extension '{ext_id}' is not installed.")
    if not ext.active:
        raise ValueError(f"Extension '{ext_id}' is not activated.")
+    return ext

-    user_ext = await get_user_extension(user.id, ext_id)
+
+async def _get_or_create_user_extension(user_id: str, ext_id: str) -> UserExtension:
+    user_ext = await get_user_extension(user_id, ext_id)
    if not user_ext:
-        user_ext = UserExtension(user=user.id, extension=ext_id, active=False)
+        user_ext = UserExtension(user=user_id, extension=ext_id, active=False)
        await create_user_extension(user_ext)
+    return user_ext

-    if user.admin or not ext.requires_payment:
-        user_ext.active = True
-        await update_user_extension(user_ext)
-        return SimpleStatus(success=True, message=f"Extension '{ext_id}' enabled.")

+def _get_required_permissions(ext_id: str, ext: InstallableExtension) -> list[str]:
+    permissions_source = (
+        ext.meta.permissions
+        if ext.meta and ext.meta.permissions
+        else _load_permissions_from_config(ext_id)
+    )
+    return [p.id for p in permissions_source] if permissions_source else []
+
+
+def _get_granted_permissions(
+    grant: ExtensionPermissionsGrant | None, user_ext: UserExtension
+) -> list[str]:
+    if grant and grant.permissions:
+        return grant.permissions
+    if user_ext.extra and user_ext.extra.granted_permissions:
+        return user_ext.extra.granted_permissions
+    return []
+
+
+def _get_required_payment_tags(ext_id: str, ext: InstallableExtension) -> list[str]:
+    tags_source = (
+        ext.meta.payment_tags
+        if ext.meta and ext.meta.payment_tags
+        else _load_payment_tags_from_config(ext_id)
+    )
+    return tags_source if tags_source else []
+
+
+def _get_granted_payment_tags(
+    grant: ExtensionPermissionsGrant | None, user_ext: UserExtension
+) -> list[str]:
+    if grant and grant.payment_tags:
+        return grant.payment_tags
+    if user_ext.extra and user_ext.extra.granted_payment_tags:
+        return user_ext.extra.granted_payment_tags
+    return []
+
+
+def _ensure_permissions(required: list[str], granted: list[str]) -> None:
+    if not required:
+        return
+    missing = [p for p in required if p not in granted]
+    if missing:
+        raise HTTPException(
+            HTTPStatus.BAD_REQUEST,
+            "Missing required permissions to enable this extension.",
+        )
+
+
+async def _store_granted_permissions(
+    user_ext: UserExtension, granted_permissions: list[str]
+) -> None:
+    user_ext_info = user_ext.extra or UserExtensionInfo()
+    user_ext_info.granted_permissions = granted_permissions
+    user_ext.extra = user_ext_info
+    await update_user_extension(user_ext)
+
+
+async def _store_granted_payment_tags(
+    user_ext: UserExtension, granted_tags: list[str]
+) -> None:
+    user_ext_info = user_ext.extra or UserExtensionInfo()
+    user_ext_info.granted_payment_tags = granted_tags
+    user_ext.extra = user_ext_info
+    await update_user_extension(user_ext)
+
+
+async def _activate_user_extension(user_ext: UserExtension) -> None:
+    user_ext.active = True
+    await update_user_extension(user_ext)
+
+
+async def _enable_paid_extension(
+    ext_id: str, ext: InstallableExtension, user_ext: UserExtension
+) -> SimpleStatus:
    if not (user_ext.extra and user_ext.extra.payment_hash_to_enable):
        raise HTTPException(
            HTTPStatus.PAYMENT_REQUIRED, f"Extension '{ext_id}' requires payment."
        )

    if user_ext.is_paid:
-        user_ext.active = True
-        await update_user_extension(user_ext)
+        await _activate_user_extension(user_ext)
        return SimpleStatus(success=True, message=f"Paid extension '{ext_id}' enabled.")

    if not ext.meta or not ext.meta.pay_to_enable or not ext.meta.pay_to_enable.wallet:
@@ -209,31 +340,137 @@ async def api_enable_extension(
            f"Invoice generated but not paid for enabeling extension '{ext_id}'.",
        )

-    user_ext.active = True
    user_ext.extra.paid_to_enable = True
-    await update_user_extension(user_ext)
+    await _activate_user_extension(user_ext)
    return SimpleStatus(success=True, message=f"Paid extension '{ext_id}' enabled.")


@extension_router.put("/{ext_id}/disable")
 async def api_disable_extension(
-    ext_id: str, user: User = Depends(check_user_exists)
+    ext_id: str, account_id: AccountId = Depends(check_account_id_exists)
 ) -> SimpleStatus:
    if ext_id not in [e.code for e in await get_valid_extensions()]:
        raise HTTPException(
            HTTPStatus.BAD_REQUEST, f"Extension '{ext_id}' doesn't exist."
        )
-    user_ext = await get_user_extension(user.id, ext_id)
+    user_ext = await get_user_extension(account_id.id, ext_id)
    if not user_ext or not user_ext.active:
        return SimpleStatus(
            success=True, message=f"Extension '{ext_id}' already disabled."
        )
    logger.info(f"Disabling extension: {ext_id}.")
    user_ext.active = False
+    if user_ext.extra and user_ext.extra.granted_permissions:
+        user_ext.extra.granted_permissions = []
+    if user_ext.extra and user_ext.extra.granted_payment_tags:
+        user_ext.extra.granted_payment_tags = []
    await update_user_extension(user_ext)
+    ext = await get_installed_extension(ext_id)
+    if ext and ext.meta and ext.meta.extension_type == "wasm":
+        await clear_tag_watches_for_user(ext_id, account_id.id)
+        await clear_schedules_for_user(ext_id, account_id.id)
    return SimpleStatus(success=True, message=f"Extension '{ext_id}' disabled.")


+@extension_router.put("/{ext_id}/permissions")
+async def api_update_extension_permissions(
+    ext_id: str,
+    request: Request,
+    account_id: AccountId = Depends(check_account_id_exists),
+    grant: ExtensionPermissionsGrant | None = Body(default=None),
+) -> SimpleStatus:
+    if ext_id not in [e.code for e in await get_valid_extensions()]:
+        raise HTTPException(
+            HTTPStatus.NOT_FOUND, f"Extension '{ext_id}' doesn't exist."
+        )
+
+    ext = await get_installed_extension(ext_id)
+    if not ext:
+        raise ValueError(f"Extension '{ext_id}' is not installed.")
+    if not ext.active:
+        raise ValueError(f"Extension '{ext_id}' is not activated.")
+
+    user_ext = await get_user_extension(account_id.id, ext_id)
+    if not user_ext:
+        user_ext = UserExtension(user=account_id.id, extension=ext_id, active=False)
+        await create_user_extension(user_ext)
+
+    permissions_source = (
+        ext.meta.permissions
+        if ext.meta and ext.meta.permissions
+        else _load_permissions_from_config(ext_id)
+    )
+    required_permissions = (
+        [p.id for p in permissions_source] if permissions_source else []
+    )
+    granted_permissions = grant.permissions if grant and grant.permissions else []
+    granted_tags = grant.payment_tags if grant and grant.payment_tags else []
+    if _is_wasm_extension(ext_id, ext):
+        _ensure_api_permissions_available(
+            request, _merge_permissions(required_permissions, granted_permissions)
+        )
+        _ensure_payment_tags_allowed(
+            _get_required_payment_tags(ext_id, ext), granted_tags
+        )
+
+    if required_permissions:
+        missing = [p for p in required_permissions if p not in granted_permissions]
+        if missing:
+            raise HTTPException(
+                HTTPStatus.BAD_REQUEST,
+                "Missing required permissions to save for this extension.",
+            )
+
+    user_ext_info = user_ext.extra or UserExtensionInfo()
+    user_ext_info.granted_permissions = granted_permissions
+    user_ext_info.granted_payment_tags = granted_tags
+    user_ext.extra = user_ext_info
+    await update_user_extension(user_ext)
+
+    return SimpleStatus(success=True, message=f"Permissions saved for '{ext_id}'.")
+
+
+@extension_router.get("/{ext_id}/capabilities")
+async def api_extension_capabilities(
+    ext_id: str,
+    request: Request,
+    account_id: AccountId = Depends(check_account_id_exists),
+) -> dict:
+    await _ensure_extension_exists(ext_id)
+    ext = await get_installed_extension(ext_id)
+    if not ext:
+        raise ValueError(f"Extension '{ext_id}' is not installed.")
+
+    permissions_source = (
+        ext.meta.permissions
+        if ext.meta and ext.meta.permissions
+        else _load_permissions_from_config(ext_id)
+    )
+    permissions = [p.id for p in permissions_source] if permissions_source else []
+    missing = (
+        _missing_api_permissions(request, permissions)
+        if _is_wasm_extension(ext_id, ext)
+        else []
+    )
+    payment_tags = _get_required_payment_tags(ext_id, ext)
+
+    return {
+        "ok": True,
+        "extension": ext_id,
+        "is_wasm": _is_wasm_extension(ext_id, ext),
+        "permissions": permissions,
+        "missing_permissions": missing,
+        "payment_tags": payment_tags,
+    }
+
+
+@extension_router.get("/wasm/manifest")
+async def api_wasm_manifest(
+    account_id: AccountId = Depends(check_account_id_exists),
+) -> dict:
+    return WASM_HOST_MANIFEST
+
+
@extension_router.put("/{ext_id}/activate", dependencies=[Depends(check_admin)])
 async def api_activate_extension(ext_id: str) -> SimpleStatus:
    try:
@@ -374,7 +611,9 @@ async def get_pay_to_install_invoice(

@extension_router.put("/{ext_id}/invoice/enable")
 async def get_pay_to_enable_invoice(
-    ext_id: str, data: PayToEnableInfo, user: User = Depends(check_user_exists)
+    ext_id: str,
+    data: PayToEnableInfo,
+    account_id: AccountId = Depends(check_account_id_exists),
 ):
    if not data.amount or data.amount <= 0:
        raise HTTPException(
@@ -420,9 +659,9 @@ async def get_pay_to_enable_invoice(
        memo=f"Enable '{ext.name}' extension.",
    )

-    user_ext = await get_user_extension(user.id, ext_id)
+    user_ext = await get_user_extension(account_id.id, ext_id)
    if not user_ext:
-        user_ext = UserExtension(user=user.id, extension=ext_id, active=False)
+        user_ext = UserExtension(user=account_id.id, extension=ext_id, active=False)
        await create_user_extension(user_ext)
    user_ext_info = user_ext.extra if user_ext.extra else UserExtensionInfo()
    user_ext_info.payment_hash_to_enable = payment.payment_hash
@@ -433,7 +672,7 @@ async def get_pay_to_enable_invoice(

@extension_router.get(
    "/release/{org}/{repo}/{tag_name}",
-    dependencies=[Depends(check_user_exists)],
+    dependencies=[Depends(check_account_exists)],
 )
 async def get_extension_release(org: str, repo: str, tag_name: str):
    try:
@@ -454,15 +693,18 @@ async def get_extension_release(org: str, repo: str, tag_name: str):

@extension_router.get("")
 async def api_get_user_extensions(
-    user: User = Depends(check_user_exists),
+    account_id: AccountId = Depends(check_account_id_exists),
 ) -> list[Extension]:
-
-    user_extensions_ids = [ue.extension for ue in await get_user_extensions(user.id)]
-    return [
-        ext
-        for ext in await get_valid_extensions(False)
-        if ext.code in user_extensions_ids
-    ]
+    async with db.connect() as conn:
+        user_extensions_ids = [
+            ue.extension for ue in await get_user_extensions(account_id.id, conn=conn)
+        ]
+        valid_extensions = [
+            ext
+            for ext in await get_valid_extensions(False, conn=conn)
+            if ext.code in user_extensions_ids
+        ]
+        return valid_extensions


@extension_router.delete(
@@ -492,3 +734,318 @@ async def delete_extension_db(ext_id: str):
            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
            detail=f"Cannot delete data for extension '{ext_id}'",
        ) from exc
+
+
+# TODO: create a response model for this
+@extension_router.get("/all")
+async def extensions(account_id: AccountId = Depends(check_account_id_exists)):
+    async with db.connect() as conn:
+        installed_exts: list[InstallableExtension] = await get_installed_extensions(
+            conn=conn
+        )
+        user_exts = await get_user_extensions(account_id.id, conn=conn)
+        all_ext_ids = [ext.code for ext in await get_valid_extensions(conn=conn)]
+        inactive_extensions = [
+            e.id for e in await get_installed_extensions(active=False, conn=conn)
+        ]
+        db_versions = await get_db_versions(conn=conn)
+
+    installed_exts_ids = [e.id for e in installed_exts]
+    user_exts_map = {e.extension: e for e in user_exts}
+
+    installable_exts = await InstallableExtension.get_installable_extensions(
+        post_refresh_cache=account_id.is_admin_id
+    )
+    installable_exts_ids = [e.id for e in installable_exts]
+    installable_exts += [e for e in installed_exts if e.id not in installable_exts_ids]
+
+    for e in installable_exts:
+        installed_ext = next((ie for ie in installed_exts if e.id == ie.id), None)
+        if installed_ext and installed_ext.meta:
+            installed_release = installed_ext.meta.installed_release
+            if installed_ext.meta.pay_to_enable and not account_id.is_admin_id:
+                # not a security leak, but better not to share the wallet id
+                installed_ext.meta.pay_to_enable.wallet = None
+            pay_to_enable = installed_ext.meta.pay_to_enable
+
+            if e.meta:
+                e.meta.installed_release = installed_release
+                e.meta.pay_to_enable = pay_to_enable
+            else:
+                e.meta = ExtensionMeta(
+                    installed_release=installed_release,
+                    pay_to_enable=pay_to_enable,
+                )
+            # use the installed extension values
+            e.name = installed_ext.name
+            e.short_description = installed_ext.short_description
+            e.icon = installed_ext.icon
+        if e.meta and not e.meta.permissions:
+            e.meta.permissions = _load_permissions_from_config(e.id)
+        if e.meta and not e.meta.payment_tags:
+            e.meta.payment_tags = _load_payment_tags_from_config(e.id)
+
+    extension_data = [
+        {
+            "id": ext.id,
+            "name": ext.name,
+            "icon": ext.icon,
+            "shortDescription": ext.short_description,
+            "stars": ext.stars,
+            "isFeatured": ext.meta.featured if ext.meta else False,
+            "dependencies": ext.meta.dependencies if ext.meta else "",
+            "isInstalled": ext.id in installed_exts_ids,
+            "hasDatabaseTables": next(
+                (True for version in db_versions if version.db == ext.id), False
+            ),
+            "isAvailable": ext.id in all_ext_ids,
+            "isAdminOnly": ext.id in settings.lnbits_admin_extensions,
+            "isActive": ext.id not in inactive_extensions,
+            "permissions": (
+                [dict(p) for p in ext.meta.permissions]
+                if ext.meta and ext.meta.permissions
+                else [dict(p) for p in _load_permissions_from_config(ext.id)]
+            ),
+            "paymentTags": (
+                ext.meta.payment_tags
+                if ext.meta and ext.meta.payment_tags
+                else _load_payment_tags_from_config(ext.id)
+            ),
+            "kvSchema": _load_kv_schema_from_config(ext.id),
+            "grantedPermissions": (
+                user_ext.extra.granted_permissions
+                if (user_ext := user_exts_map.get(ext.id)) and user_ext.extra
+                else []
+            ),
+            "grantedPaymentTags": (
+                user_ext.extra.granted_payment_tags
+                if (user_ext := user_exts_map.get(ext.id)) and user_ext.extra
+                else []
+            ),
+            "latestRelease": (
+                dict(ext.meta.latest_release)
+                if ext.meta and ext.meta.latest_release
+                else None
+            ),
+            "hasPaidRelease": ext.meta.has_paid_release if ext.meta else False,
+            "hasFreeRelease": ext.meta.has_free_release if ext.meta else False,
+            "paidFeatures": ext.meta.paid_features if ext.meta else False,
+            "installedRelease": (
+                dict(ext.meta.installed_release)
+                if ext.meta and ext.meta.installed_release
+                else None
+            ),
+            "payToEnable": (
+                dict(ext.meta.pay_to_enable)
+                if ext.meta and ext.meta.pay_to_enable
+                else {}
+            ),
+            "isPaymentRequired": ext.requires_payment,
+            "inProgress": False,
+            "selectedForUpdate": False,
+        }
+        for ext in installable_exts
+    ]
+    return extension_data
+
+
+def _load_permissions_from_config(ext_id: str) -> list[ExtensionPermission]:
+    try:
+        conf_path = Path(
+            settings.lnbits_extensions_path, "extensions", ext_id, "config.json"
+        )
+        if not conf_path.is_file():
+            return []
+        with open(conf_path, "r+") as json_file:
+            config_json = json.load(json_file)
+        permissions = config_json.get("permissions", [])
+        return [ExtensionPermission(**p) for p in permissions]
+    except Exception:
+        return []
+
+
+def _load_kv_schema_from_config(ext_id: str) -> dict:
+    try:
+        conf_path = Path(
+            settings.lnbits_extensions_path, "extensions", ext_id, "config.json"
+        )
+        if not conf_path.is_file():
+            return {}
+        with open(conf_path, "r+") as json_file:
+            config_json = json.load(json_file)
+        schema = config_json.get("kv_schema", {})
+        return schema if isinstance(schema, dict) else {}
+    except Exception:
+        return {}
+
+
+def _load_payment_tags_from_config(ext_id: str) -> list[str]:
+    try:
+        conf_path = Path(
+            settings.lnbits_extensions_path, "extensions", ext_id, "config.json"
+        )
+        if not conf_path.is_file():
+            return []
+        with open(conf_path, "r+") as json_file:
+            config_json = json.load(json_file)
+        tags = config_json.get("payment_tags", [])
+        return tags if isinstance(tags, list) else []
+    except Exception:
+        return []
+
+
+def _merge_permissions(required: list[str], granted: list[str]) -> list[str]:
+    merged = set()
+    for perm in required or []:
+        merged.add(perm)
+    for perm in granted or []:
+        merged.add(perm)
+    return list(merged)
+
+
+def _ensure_payment_tags_allowed(required: list[str], granted: list[str]) -> None:
+    if not required and granted:
+        raise HTTPException(
+            HTTPStatus.BAD_REQUEST,
+            "This extension does not declare any payment tags.",
+        )
+    if required and not granted:
+        raise HTTPException(
+            HTTPStatus.BAD_REQUEST,
+            "Select at least one payment tag before enabling this extension.",
+        )
+    if not required or not granted:
+        return
+    invalid = [t for t in granted if t not in required]
+    if invalid:
+        raise HTTPException(
+            HTTPStatus.BAD_REQUEST,
+            f"Invalid payment tags requested: {', '.join(invalid)}",
+        )
+
+
+def _ensure_api_permissions_available(request: Request, permissions: list[str]) -> None:
+    if not permissions:
+        return
+    missing = []
+    for perm in permissions:
+        parsed = _parse_api_permission(perm)
+        if not parsed:
+            continue
+        method, path = parsed
+        if not _route_exists(request, method, path):
+            missing.append(perm)
+    if missing:
+        raise HTTPException(
+            HTTPStatus.BAD_REQUEST,
+            f"Permissions reference missing endpoints: {', '.join(missing)}",
+        )
+
+
+def _parse_api_permission(perm: str) -> tuple[str, str] | None:
+    if not perm.startswith("api."):
+        return None
+    try:
+        method_part, path = perm.split(":", 1)
+        method = method_part.replace("api.", "").upper()
+    except ValueError:
+        return None
+    if not path.startswith("/"):
+        return None
+    return method, path
+
+
+def _missing_api_permissions(request: Request, permissions: list[str]) -> list[str]:
+    missing = []
+    for perm in permissions or []:
+        parsed = _parse_api_permission(perm)
+        if not parsed:
+            continue
+        method, path = parsed
+        if not _route_exists(request, method, path):
+            missing.append(perm)
+    return missing
+
+
+def _route_exists(request: Request, method: str, path: str) -> bool:
+    scope = {
+        "type": "http",
+        "method": method,
+        "path": path,
+        "root_path": "",
+        "headers": [],
+    }
+    for route in request.app.router.routes:
+        methods = getattr(route, "methods", None)
+        if methods and method not in methods:
+            continue
+        try:
+            match, _ = route.matches(scope)
+        except Exception as exc:
+            logger.debug(f"Route match failed for {method} {path}: {exc!s}")
+            continue
+        if match == Match.FULL:
+            return True
+    return False
+
+
+def _is_wasm_extension(ext_id: str, ext: InstallableExtension) -> bool:
+    if ext.meta and ext.meta.extension_type == "wasm":
+        return True
+    try:
+        conf_path = Path(
+            settings.lnbits_extensions_path, "extensions", ext_id, "config.json"
+        )
+        if not conf_path.is_file():
+            return False
+        with open(conf_path, "r+") as json_file:
+            config_json = json.load(json_file)
+        return config_json.get("extension_type") == "wasm"
+    except Exception:
+        return False
+
+
+@extension_router.get(
+    "/reviews/tags",
+    dependencies=[Depends(check_account_exists)],
+)
+async def get_extension_reviews_tags() -> list[ExtensionReviewsStatus]:
+    async with httpx.AsyncClient() as client:
+        resp = await client.get(settings.lnbits_extensions_reviews_url + "/tags")
+        resp.raise_for_status()
+        data = resp.json()
+        return [ExtensionReviewsStatus(**item) for item in data]
+
+
+@extension_router.get(
+    "/reviews/{ext_id}",
+    dependencies=[Depends(check_account_exists)],
+)
+async def get_extension_reviews(ext_id: str, request: Request) -> Page[ExtensionReview]:
+    async with httpx.AsyncClient() as client:
+        query_string = str(request.query_params)
+        resp = await client.get(
+            settings.lnbits_extensions_reviews_url + f"/reviews/{ext_id}?{query_string}"
+        )
+        resp.raise_for_status()
+        reviews = resp.json()
+        return Page(
+            data=[ExtensionReview(**item) for item in reviews["data"]],
+            total=reviews["total"],
+        )
+
+
+@extension_router.put(
+    "/reviews",
+    dependencies=[Depends(check_account_exists)],
+)
+async def create_extension_review(
+    data: CreateExtensionReview,
+) -> ExtensionReviewPaymentRequest:
+    async with httpx.AsyncClient() as client:
+        resp = await client.post(
+            settings.lnbits_extensions_reviews_url + "/reviews", json=data.dict()
+        )
+        resp.raise_for_status()
+        payment_request = resp.json()
+        return ExtensionReviewPaymentRequest(**payment_request)
@@ -1,14 +1,12 @@
 import os
 import shutil
 from hashlib import sha256
-from http import HTTPStatus

-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, Depends
 from fastapi.responses import FileResponse

 from lnbits.core.models import (
    SimpleStatus,
-    User,
 )
 from lnbits.core.models.extensions import (
    Extension,
@@ -17,6 +15,7 @@ from lnbits.core.models.extensions import (
    UserExtension,
 )
 from lnbits.core.models.extensions_builder import ExtensionData
+from lnbits.core.models.users import Account, AccountId
 from lnbits.core.services.extensions import (
    activate_extension,
    install_extension,
@@ -27,10 +26,10 @@ from lnbits.core.services.extensions_builder import (
    zip_directory,
 )
 from lnbits.decorators import (
+    check_account_id_exists,
    check_admin,
-    check_user_exists,
+    check_extension_builder,
 )
-from lnbits.settings import settings

 from ..crud import (
    create_user_extension,
@@ -47,19 +46,12 @@ extension_builder_router = APIRouter(
@extension_builder_router.post(
    "/zip",
    summary="Build and download extension zip.",
+    dependencies=[Depends(check_extension_builder)],
    description="""
        This endpoint generates a zip file for the extension based on the provided data.
    """,
 )
-async def api_build_extension(
-    data: ExtensionData,
-    user: User = Depends(check_user_exists),
-) -> FileResponse:
-    if not settings.lnbits_extensions_builder_activate_non_admins and not user.admin:
-        raise HTTPException(
-            HTTPStatus.FORBIDDEN,
-            "Extension Builder is disabled for non admin users.",
-        )
+async def api_build_extension(data: ExtensionData) -> FileResponse:
    stub_ext_id = "extension_builder_stub"  # todo: do not hardcode, fetch from manifest
    release, build_dir = await build_extension_from_data(data, stub_ext_id)

@@ -92,9 +84,9 @@ async def api_build_extension(
 )
 async def api_deploy_extension(
    data: ExtensionData,
-    user: User = Depends(check_admin),
+    account: Account = Depends(check_admin),
 ) -> SimpleStatus:
-    working_dir_name = "deploy_" + sha256(user.id.encode("utf-8")).hexdigest()
+    working_dir_name = "deploy_" + sha256(account.id.encode("utf-8")).hexdigest()
    stub_ext_id = "extension_builder_stub"
    release, build_dir = await build_extension_from_data(
        data, stub_ext_id, working_dir_name
@@ -118,9 +110,9 @@ async def api_deploy_extension(

    await activate_extension(Extension.from_installable_ext(ext_info))

-    user_ext = await get_user_extension(user.id, data.id)
+    user_ext = await get_user_extension(account.id, data.id)
    if not user_ext:
-        user_ext = UserExtension(user=user.id, extension=data.id, active=True)
+        user_ext = UserExtension(user=account.id, extension=data.id, active=True)
        await create_user_extension(user_ext)
    elif not user_ext.active:
        user_ext.active = True
@@ -132,18 +124,14 @@ async def api_deploy_extension(
@extension_builder_router.post(
    "/preview",
    summary="Build and preview the extension ui.",
+    dependencies=[Depends(check_extension_builder)],
 )
 async def api_preview_extension(
    data: ExtensionData,
-    user: User = Depends(check_user_exists),
+    account_id: AccountId = Depends(check_account_id_exists),
 ) -> SimpleStatus:
-    if not settings.lnbits_extensions_builder_activate_non_admins and not user.admin:
-        raise HTTPException(
-            HTTPStatus.FORBIDDEN,
-            "Extension Builder is disabled for non admin users.",
-        )
    stub_ext_id = "extension_builder_stub"
-    working_dir_name = "preview_" + sha256(user.id.encode("utf-8")).hexdigest()
+    working_dir_name = "preview_" + sha256(account_id.id.encode("utf-8")).hexdigest()
    await build_extension_from_data(data, stub_ext_id, working_dir_name)

    return SimpleStatus(success=True, message=f"Extension '{data.id}' preview ready.")
@@ -1,6 +1,7 @@
 from http import HTTPStatus

 from fastapi import APIRouter, Depends, HTTPException
+from loguru import logger

 from lnbits.core.models.misc import SimpleStatus
 from lnbits.core.models.wallets import WalletTypeInfo
@@ -30,6 +31,11 @@ async def create_subscription(
    data: CreateFiatSubscription,
    key_type: WalletTypeInfo = Depends(require_admin_key),
 ) -> FiatSubscriptionResponse:
+    logger.debug(
+        f"Creating subscription with provider '{provider}. '"
+        f"Subscription ID '{data.subscription_id}'."
+    )
+
    fiat_provider = await get_fiat_provider(provider)
    if not fiat_provider:
        raise HTTPException(404, "Fiat provider not found")
@@ -47,6 +53,12 @@ async def create_subscription(
    subscription_response = await fiat_provider.create_subscription(
        data.subscription_id, data.quantity, data.payment_options
    )
+    if subscription_response.error_message:
+        logger.warning(
+            f"Failed to create subscription with provider '{provider}': "
+            f"{subscription_response.error_message}"
+        )
+
    return subscription_response


@@ -75,20 +87,28 @@ async def cancel_subscription(
 )
 async def connection_token(provider: str):
    fiat_provider = await get_fiat_provider(provider)
-    if provider == "stripe":
-        if not isinstance(fiat_provider, StripeWallet):
+    if not fiat_provider:
+        raise HTTPException(status_code=404, detail="Fiat provider not found")
+
+    if provider != "stripe":
+        raise HTTPException(
+            status_code=400,
+            detail=f"Connection tokens are not supported for provider '{provider}'.",
+        )
+
+    if not isinstance(fiat_provider, StripeWallet):
+        raise HTTPException(
+            status_code=500, detail="Stripe wallet/provider not configured"
+        )
+    try:
+        tok = await fiat_provider.create_terminal_connection_token()
+        secret = tok.get("secret")
+        if not secret:
            raise HTTPException(
-                status_code=500, detail="Stripe wallet/provider not configured"
+                status_code=502, detail="Stripe returned no connection token"
            )
-        try:
-            tok = await fiat_provider.create_terminal_connection_token()
-            secret = tok.get("secret")
-            if not secret:
-                raise HTTPException(
-                    status_code=502, detail="Stripe returned no connection token"
-                )
-            return {"secret": secret}
-        except Exception as e:
-            raise HTTPException(
-                status_code=500, detail="Failed to create connection token"
-            ) from e
+        return {"secret": secret}
+    except Exception as e:
+        raise HTTPException(
+            status_code=500, detail="Failed to create connection token"
+        ) from e
@@ -1,35 +1,29 @@
 from hashlib import sha256
 from http import HTTPStatus
 from pathlib import Path
-from typing import Annotated
 from urllib.parse import urlencode, urlparse

 import httpx
-from fastapi import Cookie, Depends, Query, Request
+from fastapi import Depends, Request
 from fastapi.exceptions import HTTPException
 from fastapi.responses import FileResponse, HTMLResponse, RedirectResponse
 from fastapi.routing import APIRouter
 from lnurl import url_decode
-from pydantic.types import UUID4

 from lnbits.core.helpers import to_valid_user_id
 from lnbits.core.models import User
-from lnbits.core.models.extensions import ExtensionMeta, InstallableExtension
 from lnbits.core.services import create_invoice, create_user_account
-from lnbits.core.services.extensions import get_valid_extensions
-from lnbits.decorators import check_admin, check_user_exists
+from lnbits.decorators import (
+    check_admin,
+    check_admin_ui,
+    check_extension_builder,
+    check_first_install,
+    check_user_exists,
+)
 from lnbits.helpers import check_callback_url, template_renderer
 from lnbits.settings import settings
-from lnbits.wallets import get_funding_source

-from ...utils.exchange_rates import allowed_currencies, currencies
-from ..crud import (
-    create_wallet,
-    get_db_versions,
-    get_installed_extensions,
-    get_user,
-    get_wallet,
-)
+from ..crud import get_user

 generic_router = APIRouter(
    tags=["Core NON-API Website Routes"], include_in_schema=False
@@ -41,295 +35,51 @@ async def favicon():
    return RedirectResponse(settings.lnbits_qr_logo)


-@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(
-    "/account",
-    response_class=HTMLResponse,
-    description="show account page",
-)
-async def account(
-    request: Request,
-    user: User = Depends(check_user_exists),
-):
-    nostr_configured = settings.is_nostr_notifications_configured()
-    telegram_configured = settings.is_telegram_notifications_configured()
-    return template_renderer().TemplateResponse(
-        request,
-        "core/account.html",
-        {
-            "user": user.json(),
-            "nostr_configured": nostr_configured,
-            "telegram_configured": telegram_configured,
-            "ajax": _is_ajax_request(request),
-        },
-    )
-
-
-@generic_router.get(
-    "/wallet",
-    response_class=HTMLResponse,
-    description="show wallet page",
-)
-async def get_user_wallet(
-    request: Request,
-    lnbits_last_active_wallet: Annotated[str | None, Cookie()] = None,
-    user: User = Depends(check_user_exists),
-    wal: UUID4 | None = Query(None),
-):
-    if wal:
-        wallet = await get_wallet(wal.hex)
-    elif len(user.wallets) == 0:
-        wallet = await create_wallet(user_id=user.id)
-        user.wallets.append(wallet)
-    elif lnbits_last_active_wallet and user.get_wallet(lnbits_last_active_wallet):
-        wallet = await get_wallet(lnbits_last_active_wallet)
-    else:
-        wallet = user.wallets[0]
-
-    if not wallet or wallet.deleted:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND,
-            detail="Wallet not found",
-        )
-    if wallet.user != user.id:
-        raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN,
-            detail="Not your wallet.",
-        )
-    context = {
-        "user": user.json(),
-        "wallet": wallet.json(),
-        "wallet_name": wallet.name,
-        "currencies": allowed_currencies(),
-        "service_fee": settings.lnbits_service_fee,
-        "service_fee_max": settings.lnbits_service_fee_max,
-        "web_manifest": f"/manifest/{user.id}.webmanifest",
-    }
-
-    return template_renderer().TemplateResponse(
-        request,
-        "core/wallet.html",
-        {**context, "ajax": _is_ajax_request(request)},
-    )
-
-
-@generic_router.get(
-    "/wallets",
-    response_class=HTMLResponse,
-    description="show wallets page",
-)
-async def wallets(
-    request: Request,
-    user: User = Depends(check_user_exists),
-):
-    return template_renderer().TemplateResponse(
-        request,
-        "core/wallets.html",
-        {
-            "user": user.json(),
-            "ajax": _is_ajax_request(request),
-        },
-    )
-
-
-@generic_router.get("/first_install", response_class=HTMLResponse)
-async def first_install(request: Request):
-    if not settings.first_install:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
-            detail="Super user account has already been configured.",
-        )
-    return template_renderer().TemplateResponse(
-        request,
-        "core/first_install.html",
-    )
-
-
@generic_router.get("/robots.txt", response_class=HTMLResponse)
 async def robots():
-    data = """
-    User-agent: *
-    Disallow: /
-    """
+    data = "User-agent: *\nDisallow: /"
    return HTMLResponse(content=data, media_type="text/plain")


-@generic_router.get("/extensions", name="extensions", response_class=HTMLResponse)
-async def extensions(request: Request, user: User = Depends(check_user_exists)):
-    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 += [e for e in installed_exts if e.id not in installable_exts_ids]
-
-    for e in installable_exts:
-        installed_ext = next((ie for ie in installed_exts if e.id == ie.id), None)
-        if installed_ext and installed_ext.meta:
-            installed_release = installed_ext.meta.installed_release
-            if installed_ext.meta.pay_to_enable and not user.admin:
-                # not a security leak, but better not to share the wallet id
-                installed_ext.meta.pay_to_enable.wallet = None
-            pay_to_enable = installed_ext.meta.pay_to_enable
-
-            if e.meta:
-                e.meta.installed_release = installed_release
-                e.meta.pay_to_enable = pay_to_enable
-            else:
-                e.meta = ExtensionMeta(
-                    installed_release=installed_release,
-                    pay_to_enable=pay_to_enable,
-                )
-            # use the installed extension values
-            e.name = installed_ext.name
-            e.short_description = installed_ext.short_description
-            e.icon = installed_ext.icon
-
-    all_ext_ids = [ext.code for ext in await get_valid_extensions()]
-    inactive_extensions = [e.id for e in await get_installed_extensions(active=False)]
-    db_versions = await get_db_versions()
-
-    extension_data = [
-        {
-            "id": ext.id,
-            "name": ext.name,
-            "icon": ext.icon,
-            "shortDescription": ext.short_description,
-            "stars": ext.stars,
-            "isFeatured": ext.meta.featured if ext.meta else False,
-            "dependencies": ext.meta.dependencies if ext.meta else "",
-            "isInstalled": ext.id in installed_exts_ids,
-            "hasDatabaseTables": next(
-                (True for version in db_versions if version.db == ext.id), False
-            ),
-            "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.meta.latest_release)
-                if ext.meta and ext.meta.latest_release
-                else None
-            ),
-            "hasPaidRelease": ext.meta.has_paid_release if ext.meta else False,
-            "hasFreeRelease": ext.meta.has_free_release if ext.meta else False,
-            "paidFeatures": ext.meta.paid_features if ext.meta else False,
-            "installedRelease": (
-                dict(ext.meta.installed_release)
-                if ext.meta and ext.meta.installed_release
-                else None
-            ),
-            "payToEnable": (
-                dict(ext.meta.pay_to_enable)
-                if ext.meta and ext.meta.pay_to_enable
-                else {}
-            ),
-            "isPaymentRequired": ext.requires_payment,
-        }
-        for ext in installable_exts
-    ]
-
-    # refresh user state. Eg: enabled extensions.
-    # TODO: refactor
-    # user = await get_user(user.id) or user
-
-    return template_renderer().TemplateResponse(
-        request,
-        "core/extensions.html",
-        {
-            "user": user.json(),
-            "extension_data": extension_data,
-            "extension_builder_enabled": user.admin
-            or settings.lnbits_extensions_builder_activate_non_admins,
-            "ajax": _is_ajax_request(request),
-        },
-    )
-
-
@generic_router.get(
-    "/extensions/builder", name="extensions builder", response_class=HTMLResponse
-)
-async def extensions_builder(request: Request, user: User = Depends(check_user_exists)):
-    if not settings.lnbits_extensions_builder_activate_non_admins and not user.admin:
-        raise HTTPException(
-            HTTPStatus.FORBIDDEN,
-            "Extension Builder is disabled for non admin users.",
-        )
-    return template_renderer().TemplateResponse(
-        request,
-        "core/extensions_builder.html",
-        {
-            "user": user.json(),
-            "ajax": _is_ajax_request(request),
-        },
-    )
-
-
-@generic_router.get(
-    "/extensions/builder/preview/{ext_id}",
+    "/extensions/builder/preview/{ext_id}/{resource}",
    name="extensions builder",
-    response_class=HTMLResponse,
+    dependencies=[Depends(check_extension_builder)],
 )
 async def extensions_builder_preview(
-    request: Request,
    ext_id: str,
+    resource: str | None = None,
    page_name: str | None = None,
    user: User = Depends(check_user_exists),
-):
-    if not settings.lnbits_extensions_builder_activate_non_admins and not user.admin:
-        raise HTTPException(
-            HTTPStatus.FORBIDDEN,
-            "Extension Builder is disabled for non admin users.",
-        )
+) -> FileResponse:
    working_dir_name = "preview_" + sha256(user.id.encode("utf-8")).hexdigest()
-    html_file_name = "index.html"
-    if page_name == "public_page":
-        html_file_name = "public_page.html"

-    html_file_path = Path(
+    file_name = "index"
+    if page_name == "public_page":
+        file_name = "public_page"
+
+    resource_path = Path(
+        settings.extension_builder_working_dir_path,
        "extension_builder_stub",
        ext_id,
        working_dir_name,
        ext_id,
-        "templates",
-        ext_id,
-        html_file_name,
+        "static",
    )

-    html_file_full_path = Path(
-        settings.extension_builder_working_dir_path, html_file_path
-    )
+    file_ext = ".vue" if resource == "template" else ".js"
+    file_full_path = Path(resource_path, file_name + file_ext)

-    if not html_file_full_path.is_file():
-        return template_renderer().TemplateResponse(
-            request,
-            "error.html",
-            {
-                "err": f"Extension {ext_id} not found",
-                "message": "Please 'Refresh Preview' first.",
-            },
-            status_code=HTTPStatus.NOT_FOUND,
-        )
-
-    response = template_renderer().TemplateResponse(
-        request,
-        html_file_path.as_posix(),
-        {
-            "user": user.json(),
-            "ajax": _is_ajax_request(request),
-        },
-    )
+    if not file_full_path.is_file():
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)

+    response = FileResponse(file_full_path.absolute().as_posix())
    response.headers["Content-Security-Policy"] = (
        "default-src 'self'; "
        "style-src 'self' 'unsafe-inline'; "
        "script-src 'self' 'unsafe-inline' 'unsafe-eval'"
    )
+
    return response


@@ -359,7 +109,7 @@ 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 "images/logos/lnbits.png"
                ),
                "sizes": "512x512",
                "type": "image/png",
@@ -426,104 +176,42 @@ async def manifest(request: Request, usr: str):
    }


-@generic_router.get("/node", response_class=HTMLResponse)
-async def node(request: Request, user: User = Depends(check_admin)):
-    if not settings.lnbits_node_ui:
-        raise HTTPException(status_code=HTTPStatus.SERVICE_UNAVAILABLE)
+admin_ui_checks = [Depends(check_admin), Depends(check_admin_ui)]

-    funding_source = get_funding_source()
-    _, balance = await funding_source.status()

+@generic_router.get("/payments")
+@generic_router.get("/wallet")
+@generic_router.get("/wallet/{wallet_id}")
+@generic_router.get("/wallets")
+@generic_router.get("/account")
+@generic_router.get("/extensions")
+@generic_router.get("/users", dependencies=admin_ui_checks)
+@generic_router.get("/audit", dependencies=admin_ui_checks)
+@generic_router.get("/node", dependencies=admin_ui_checks)
+@generic_router.get("/admin", dependencies=admin_ui_checks)
+@generic_router.get(
+    "/extensions/builder", dependencies=[Depends(check_extension_builder)]
+)
+@generic_router.get(
+    "/extensions/builder/preview", dependencies=[Depends(check_extension_builder)]
+)
+async def index(
+    request: Request, user: User = Depends(check_user_exists)
+) -> HTMLResponse:
    return template_renderer().TemplateResponse(
        request,
-        "node/index.html",
+        "index.html",
        {
            "user": user.json(),
-            "balance": balance,
-            "wallets": user.wallets[0].json(),
-            "ajax": _is_ajax_request(request),
        },
    )


-@generic_router.get("/node/public", response_class=HTMLResponse)
-async def node_public(request: Request):
-    if not settings.lnbits_public_node_ui:
-        raise HTTPException(status_code=HTTPStatus.SERVICE_UNAVAILABLE)
-
-    funding_source = get_funding_source()
-    _, balance = await funding_source.status()
-
-    return template_renderer().TemplateResponse(
-        request,
-        "node/public.html",
-        {
-            "balance": balance,
-        },
-    )
-
-
-@generic_router.get("/admin", response_class=HTMLResponse)
-async def admin_index(request: Request, user: User = Depends(check_admin)):
-    if not settings.lnbits_admin_ui:
-        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
-
-    funding_source = get_funding_source()
-    _, balance = await funding_source.status()
-
-    return template_renderer().TemplateResponse(
-        request,
-        "admin/index.html",
-        {
-            "user": user.json(),
-            "balance": balance,
-            "currencies": list(currencies.keys()),
-            "ajax": _is_ajax_request(request),
-        },
-    )
-
-
-@generic_router.get("/users", response_class=HTMLResponse)
-async def users_index(request: Request, user: User = Depends(check_admin)):
-    if not settings.lnbits_admin_ui:
-        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
-
-    return template_renderer().TemplateResponse(
-        "users/index.html",
-        {
-            "request": request,
-            "user": user.json(),
-            "currencies": list(currencies.keys()),
-            "ajax": _is_ajax_request(request),
-        },
-    )
-
-
-@generic_router.get("/audit", response_class=HTMLResponse)
-async def audit_index(request: Request, user: User = Depends(check_admin)):
-    if not settings.lnbits_audit_enabled:
-        raise HTTPException(HTTPStatus.NOT_FOUND, "Audit not enabled")
-
-    return template_renderer().TemplateResponse(
-        "audit/index.html",
-        {
-            "request": request,
-            "user": user.json(),
-            "ajax": _is_ajax_request(request),
-        },
-    )
-
-
-@generic_router.get("/payments", response_class=HTMLResponse)
-async def payments_index(request: Request, user: User = Depends(check_user_exists)):
-    return template_renderer().TemplateResponse(
-        "payments/index.html",
-        {
-            "request": request,
-            "user": user.json(),
-            "ajax": _is_ajax_request(request),
-        },
-    )
+@generic_router.get("/")
+@generic_router.get("/node/public")
+@generic_router.get("/first_install", dependencies=[Depends(check_first_install)])
+async def index_public(request: Request) -> HTMLResponse:
+    return template_renderer().TemplateResponse(request, "index.html", {"public": True})


@generic_router.get("/uuidv4/{hex_value}")
@@ -584,7 +272,3 @@ async def lnurlwallet(request: Request, lightning: str = ""):
    return RedirectResponse(
        f"/wallet?usr={account.id}&wal={wallet.id}",
    )
-
-
-def _is_ajax_request(request: Request):
-    return request.headers.get("X-Requested-With", None) == "XMLHttpRequest"
@@ -24,7 +24,7 @@ from lnbits.core.models.lnurl import CreateLnurlPayment, LnurlScan
 from lnbits.decorators import (
    WalletTypeInfo,
    require_admin_key,
-    require_invoice_key,
+    require_base_invoice_key,
 )
 from lnbits.helpers import check_callback_url
 from lnbits.settings import settings
@@ -48,7 +48,7 @@ async def _handle(lnurl: str) -> LnurlResponseModel:

@lnurl_router.get(
    "/api/v1/lnurlscan/{code}",
-    dependencies=[Depends(require_invoice_key)],
+    dependencies=[Depends(require_base_invoice_key)],
    deprecated=True,
    response_model=LnurlPayResponse
    | LnurlWithdrawResponse
@@ -64,7 +64,7 @@ async def api_lnurlscan(code: str) -> LnurlResponseModel:

@lnurl_router.post(
    "/api/v1/lnurlscan",
-    dependencies=[Depends(require_invoice_key)],
+    dependencies=[Depends(require_base_invoice_key)],
    response_model=LnurlPayResponse
    | LnurlWithdrawResponse
    | LnurlAuthResponse
@@ -3,7 +3,6 @@ from http import HTTPStatus
 import httpx
 from fastapi import APIRouter, Body, Depends, HTTPException
 from pydantic import BaseModel
-from starlette.status import HTTP_503_SERVICE_UNAVAILABLE

 from lnbits.decorators import check_admin, check_super_user, parse_filters
 from lnbits.settings import settings
@@ -154,7 +153,7 @@ async def api_get_payments(
 ) -> Page[NodePayment] | None:
    if not settings.lnbits_node_ui_transactions:
        raise HTTPException(
-            HTTP_503_SERVICE_UNAVAILABLE,
+            HTTPStatus.SERVICE_UNAVAILABLE,
            detail="You can enable node transactions in the Admin UI",
        )
    return await node.get_payments(filters)
@@ -167,7 +166,7 @@ async def api_get_invoices(
 ) -> Page[NodeInvoice] | None:
    if not settings.lnbits_node_ui_transactions:
        raise HTTPException(
-            HTTP_503_SERVICE_UNAVAILABLE,
+            HTTPStatus.SERVICE_UNAVAILABLE,
            detail="You can enable node transactions in the Admin UI",
        )
    return await node.get_invoices(filters)
@@ -15,7 +15,10 @@ from lnbits import bolt11
 from lnbits.core.crud.payments import (
    get_payment_count_stats,
    get_wallets_stats,
+    update_payment,
 )
+from lnbits.core.crud.users import get_account
+from lnbits.core.db import db
 from lnbits.core.models import (
    CancelInvoice,
    CreateInvoice,
@@ -32,14 +35,17 @@ from lnbits.core.models import (
    SettleInvoice,
    SimpleStatus,
 )
-from lnbits.core.models.users import User
+from lnbits.core.models.payments import UpdatePaymentLabels
+from lnbits.core.models.users import AccountId
+from lnbits.core.models.wallets import BaseWalletTypeInfo
 from lnbits.db import Filters, Page
 from lnbits.decorators import (
    WalletTypeInfo,
-    check_user_exists,
+    check_account_id_exists,
    parse_filters,
    require_admin_key,
-    require_invoice_key,
+    require_base_admin_key,
+    require_base_invoice_key,
 )
 from lnbits.helpers import (
    filter_dict_keys,
@@ -64,7 +70,6 @@ from ..services import (
    perform_withdraw,
    settle_hold_invoice,
    update_pending_payment,
-    update_pending_payments,
 )

 payment_router = APIRouter(prefix="/api/v1/payments", tags=["Payments"])
@@ -79,10 +84,9 @@ payment_router = APIRouter(prefix="/api/v1/payments", tags=["Payments"])
    openapi_extra=generate_filter_params_openapi(PaymentFilters),
 )
 async def api_payments(
-    key_info: WalletTypeInfo = Depends(require_invoice_key),
+    key_info: BaseWalletTypeInfo = Depends(require_base_invoice_key),
    filters: Filters = Depends(parse_filters(PaymentFilters)),
 ):
-    await update_pending_payments(key_info.wallet.id)
    return await get_payments(
        wallet_id=key_info.wallet.id,
        pending=True,
@@ -98,11 +102,10 @@ async def api_payments(
    openapi_extra=generate_filter_params_openapi(PaymentFilters),
 )
 async def api_payments_history(
-    key_info: WalletTypeInfo = Depends(require_invoice_key),
+    key_info: BaseWalletTypeInfo = Depends(require_base_invoice_key),
    group: DateTrunc = Query("day"),
    filters: Filters[PaymentFilters] = Depends(parse_filters(PaymentFilters)),
 ):
-    await update_pending_payments(key_info.wallet.id)
    return await get_payments_history(key_info.wallet.id, group, filters)


@@ -115,14 +118,14 @@ async def api_payments_history(
 async def api_payments_counting_stats(
    count_by: PaymentCountField = Query("tag"),
    filters: Filters[PaymentFilters] = Depends(parse_filters(PaymentFilters)),
-    user: User = Depends(check_user_exists),
+    account_id: AccountId = Depends(check_account_id_exists),
 ):
-    if user.admin:
+    if account_id.is_admin_id:
        # admin user can see payments from all wallets
        for_user_id = None
    else:
        # regular user can only see payments from their wallets
-        for_user_id = user.id
+        for_user_id = account_id.id

    return await get_payment_count_stats(count_by, filters=filters, user_id=for_user_id)

@@ -135,14 +138,14 @@ async def api_payments_counting_stats(
 )
 async def api_payments_wallets_stats(
    filters: Filters[PaymentFilters] = Depends(parse_filters(PaymentFilters)),
-    user: User = Depends(check_user_exists),
+    account_id: AccountId = Depends(check_account_id_exists),
 ):
-    if user.admin:
+    if account_id.is_admin_id:
        # admin user can see payments from all wallets
        for_user_id = None
    else:
        # regular user can only see payments from their wallets
-        for_user_id = user.id
+        for_user_id = account_id.id

    return await get_wallets_stats(filters, user_id=for_user_id)

@@ -154,15 +157,15 @@ async def api_payments_wallets_stats(
    openapi_extra=generate_filter_params_openapi(PaymentFilters),
 )
 async def api_payments_daily_stats(
-    user: User = Depends(check_user_exists),
+    account_id: AccountId = Depends(check_account_id_exists),
    filters: Filters[PaymentFilters] = Depends(parse_filters(PaymentFilters)),
 ):
-    if user.admin:
+    if account_id.is_admin_id:
        # admin user can see payments from all wallets
        for_user_id = None
    else:
        # regular user can only see payments from their wallets
-        for_user_id = user.id
+        for_user_id = account_id.id
    return await get_payments_daily_stats(filters, user_id=for_user_id)


@@ -175,18 +178,30 @@ async def api_payments_daily_stats(
    openapi_extra=generate_filter_params_openapi(PaymentFilters),
 )
 async def api_payments_paginated(
-    key_info: WalletTypeInfo = Depends(require_invoice_key),
+    key_info: BaseWalletTypeInfo = Depends(require_base_invoice_key),
+    recheck_pending: bool = Query(
+        False, description="Force check and update of pending payments."
+    ),
    filters: Filters = Depends(parse_filters(PaymentFilters)),
-):
-    page = await get_payments_paginated(
-        wallet_id=key_info.wallet.id,
-        filters=filters,
-    )
-    for payment in page.data:
-        if payment.pending:
-            await update_pending_payment(payment)
+) -> Page[Payment]:
+    async with db.connect() as conn:
+        page = await get_payments_paginated(
+            wallet_id=key_info.wallet.id,
+            filters=filters,
+            conn=conn,
+        )
+        if not recheck_pending:
+            return page

-    return page
+        payments = []
+        for payment in page.data:
+            if payment.pending:
+                refreshed_payment = await update_pending_payment(payment, conn=conn)
+                payments.append(refreshed_payment)
+            else:
+                payments.append(payment)
+
+    return Page(data=payments, total=page.total)


@payment_router.get(
@@ -199,19 +214,19 @@ async def api_payments_paginated(
 )
 async def api_all_payments_paginated(
    filters: Filters = Depends(parse_filters(PaymentFilters)),
-    user: User = Depends(check_user_exists),
+    account_id: AccountId = Depends(check_account_id_exists),
 ):
-    if user.admin:
+    if account_id.is_admin_id:
        # admin user can see payments from all wallets
        for_user_id = None
    else:
        # regular user can only see payments from their wallets
-        for_user_id = user.id
+        for_user_id = account_id.id

-    return await get_payments_paginated(
-        filters=filters,
-        user_id=for_user_id,
-    )
+    async with db.connect() as conn:
+        return await get_payments_paginated(
+            filters=filters, user_id=for_user_id, conn=conn
+        )


@payment_router.post(
@@ -234,10 +249,10 @@ async def api_all_payments_paginated(
 )
 async def api_payments_create(
    invoice_data: CreateInvoice,
-    wallet: WalletTypeInfo = Depends(require_invoice_key),
+    key_info: BaseWalletTypeInfo = Depends(require_base_invoice_key),
 ) -> Payment:
-    wallet_id = wallet.wallet.id
-    if invoice_data.out is True and wallet.key_type == KeyType.admin:
+    wallet_id = key_info.wallet.id
+    if invoice_data.out is True and key_info.key_type == KeyType.admin:
        if not invoice_data.bolt11:
            raise HTTPException(
                status_code=HTTPStatus.BAD_REQUEST,
@@ -247,6 +262,7 @@ async def api_payments_create(
            wallet_id=wallet_id,
            payment_request=invoice_data.bolt11,
            extra=invoice_data.extra,
+            labels=invoice_data.labels,
        )
        return payment

@@ -260,6 +276,26 @@ async def api_payments_create(
    return await create_payment_request(wallet_id, invoice_data)


+@payment_router.put("/{payment_hash}/labels")
+async def api_update_payment_labels(
+    payment_hash: str,
+    data: UpdatePaymentLabels,
+    key_type: BaseWalletTypeInfo = Depends(require_base_admin_key),
+) -> SimpleStatus:
+    payment = await get_standalone_payment(payment_hash, wallet_id=key_type.wallet.id)
+    if payment is None:
+        raise HTTPException(HTTPStatus.NOT_FOUND, "Payment does not exist.")
+    account = await get_account(key_type.wallet.user)
+    if not account:
+        raise HTTPException(HTTPStatus.NOT_FOUND, "Account does not exist.")
+
+    # only keep labels that belong to the user
+    user_label_names = [label.name for label in account.extra.labels]
+    payment.labels = [label for label in data.labels if label in user_label_names]
+    await update_payment(payment)
+    return SimpleStatus(success=True, message="Payment labels updated.")
+
+
@payment_router.get("/fee-reserve")
 async def api_payments_fee_reserve(invoice: str = Query("invoice")) -> JSONResponse:
    invoice_obj = bolt11.decode(invoice)
@@ -301,7 +337,7 @@ async def api_payment(payment_hash, x_api_key: str | None = Header(None)):
        return {"paid": False, "status": "failed"}

    try:
-        status = await payment.check_status()
+        payment = await update_pending_payment(payment)
    except Exception:
        if wallet and wallet.id == payment.wallet_id:
            return {"paid": False, "details": payment}
@@ -310,7 +346,7 @@ async def api_payment(payment_hash, x_api_key: str | None = Header(None)):
    if wallet and wallet.id == payment.wallet_id:
        return {
            "paid": payment.success,
-            "status": f"{status!s}",
+            "status": f"{payment.status!s}",
            "preimage": payment.preimage,
            "details": payment,
        }
@@ -7,10 +7,11 @@ from fastapi import (
 )
 from starlette.responses import RedirectResponse

+from lnbits.core.models.wallets import BaseWalletTypeInfo
 from lnbits.decorators import (
    WalletTypeInfo,
    require_admin_key,
-    require_invoice_key,
+    require_base_invoice_key,
 )

 from ..crud import (
@@ -50,12 +51,12 @@ async def api_create_tinyurl(
    description="get a tinyurl by id",
 )
 async def api_get_tinyurl(
-    tinyurl_id: str, wallet: WalletTypeInfo = Depends(require_invoice_key)
+    tinyurl_id: str, key_info: BaseWalletTypeInfo = Depends(require_base_invoice_key)
 ):
    try:
        tinyurl = await get_tinyurl(tinyurl_id)
        if tinyurl:
-            if tinyurl.wallet == wallet.wallet.id:
+            if tinyurl.wallet == key_info.wallet.id:
                return tinyurl
        raise HTTPException(
            status_code=HTTPStatus.FORBIDDEN, detail="Wrong key provided."
@@ -20,6 +20,8 @@ from lnbits.core.crud import (
    update_admin_settings,
    update_wallet,
 )
+from lnbits.core.crud.users import clear_user_id_cache, get_account, update_account
+from lnbits.core.crud.wallets import delete_wallet_by_id
 from lnbits.core.models import (
    AccountFilters,
    AccountOverview,
@@ -72,7 +74,7 @@ async def api_get_users(
    summary="Get user by Id",
 )
 async def api_get_user(user_id: str) -> User:
-    user = await get_user(user_id)
+    user = await get_user(user_id, active_only=False)
    if not user:
        raise HTTPException(HTTPStatus.NOT_FOUND, "User not found.")
    return user
@@ -115,12 +117,12 @@ async def api_create_user(data: CreateUser) -> CreateUser:

@users_router.put("/user/{user_id}", name="Update user")
 async def api_update_user(
-    user_id: str, data: CreateUser, user: User = Depends(check_admin)
+    user_id: str, data: CreateUser, account: Account = Depends(check_admin)
 ) -> CreateUser:
    if user_id != data.id:
        raise HTTPException(HTTPStatus.BAD_REQUEST, "User Id missmatch.")

-    if user_id == settings.super_user and user.id != settings.super_user:
+    if user_id == settings.super_user and account.id != settings.super_user:
        raise HTTPException(
            status_code=HTTPStatus.BAD_REQUEST,
            detail="Action only allowed for super user.",
@@ -154,14 +156,11 @@ async def api_update_user(
    name="Delete user by Id",
 )
 async def api_users_delete_user(
-    user_id: str, user: User = Depends(check_admin)
+    user_id: str, account: Account = Depends(check_admin)
 ) -> SimpleStatus:
    wallets = await get_wallets(user_id, deleted=False)
-    if len(wallets) > 0:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST,
-            detail="Cannot delete user with wallets.",
-        )
+    for wallet in wallets:
+        await delete_wallet_by_id(wallet.id)

    if user_id == settings.super_user:
        raise HTTPException(
@@ -169,7 +168,7 @@ async def api_users_delete_user(
            detail="Cannot delete super user.",
        )

-    if user_id in settings.lnbits_admin_users and not user.super_user:
+    if user_id in settings.lnbits_admin_users and not account.is_super_user:
        raise HTTPException(
            status_code=HTTPStatus.BAD_REQUEST,
            detail="Only super_user can delete admin user.",
@@ -199,7 +198,7 @@ async def api_users_reset_password(user_id: str) -> str:
    return f"reset_key_{reset_key_b64}"


-@users_router.get(
+@users_router.put(
    "/user/{user_id}/admin",
    dependencies=[Depends(check_super_user)],
    name="Give or revoke admin permsisions to a user",
@@ -222,9 +221,46 @@ async def api_users_toggle_admin(user_id: str) -> SimpleStatus:
    )


+@users_router.put(
+    "/user/{user_id}/activate",
+    name="Activate or deactivate a user",
+)
+async def api_users_toggle_activated(
+    user_id: str, admin_account: Account = Depends(check_admin)
+) -> SimpleStatus:
+    if user_id == settings.super_user:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail="Cannot deactivate super user.",
+        )
+    if user_id == admin_account.id:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail="You cannot deactivate yourself.",
+        )
+
+    if settings.is_admin_user(user_id):
+        settings.lnbits_admin_users.remove(user_id)
+
+    user_account = await get_account(user_id, active_only=False)
+    if not user_account:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND,
+            detail="User not found.",
+        )
+    user_account.activated = not user_account.activated
+    await update_account(user_account)
+    await clear_user_id_cache(user_id)
+
+    return SimpleStatus(
+        success=True,
+        message=f"User {'activated' if user_account.activated else 'deactivated'}.",
+    )
+
+
@users_router.get("/user/{user_id}/wallet", name="Get wallets for user")
 async def api_users_get_user_wallet(user_id: str) -> list[Wallet]:
-    return await get_wallets(user_id)
+    return await get_wallets(user_id, deleted=None)


@users_router.post("/user/{user_id}/wallet", name="Create a new wallet for user")
@@ -247,7 +283,7 @@ async def api_users_create_user_wallet(
    "/user/{user_id}/wallet/{wallet}/undelete", name="Reactivate deleted wallet"
 )
 async def api_users_undelete_user_wallet(user_id: str, wallet: str) -> SimpleStatus:
-    wal = await get_wallet(wallet)
+    wal = await get_wallet(wallet, deleted=True)
    if not wal:
        raise HTTPException(
            status_code=HTTPStatus.NOT_FOUND,
@@ -295,7 +331,7 @@ async def api_users_delete_all_user_wallet(user_id: str) -> SimpleStatus:
    "The second time it is called will delete the entry from the DB",
 )
 async def api_users_delete_user_wallet(
-    user_id: str, wallet: str, user: User = Depends(check_admin)
+    user_id: str, wallet: str, account: Account = Depends(check_admin)
 ) -> SimpleStatus:
    wal = await get_wallet(wallet)
    if not wal:
@@ -304,7 +340,7 @@ async def api_users_delete_user_wallet(
            detail="Wallet does not exist.",
        )

-    if user_id == settings.super_user and user.id != settings.super_user:
+    if user_id == settings.super_user and account.id != settings.super_user:
        raise HTTPException(
            status_code=HTTPStatus.BAD_REQUEST,
            detail="Action only allowed for super user.",
--- a/Show More
+++ b/Show More