mre formats (#1733)

* Formatting wallet stuff

* Bundle fundle

* Added v-if

.pre-commit-config.yaml

@@ -32,11 +32,3 @@ repos:
     hooks:
       - id: flake8
         entry: poetry run flake8
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.971
-    hooks:
-      - id: mypy
-        name: mypy
-        entry: poetry run mypy
-        args: [--ignore-missing-imports]
-        additional_dependencies: [types-mock, types-protobuf]

docs/guide/wallets.md

@@ -18,7 +18,7 @@ A backend wallet can be configured using the following LNbits environment variab
 - `LNBITS_BACKEND_WALLET_CLASS`: **CoreLightningWallet**
 - `CORELIGHTNING_RPC`: /file/path/lightning-rpc
 
-### Spark (c-lightning)
+### Spark (Core Lightning)
 
 - `LNBITS_BACKEND_WALLET_CLASS`: **SparkWallet**
 - `SPARK_URL`: http://10.147.17.230:9737/rpc

lnbits/app.py

@@ -157,10 +157,14 @@ async def check_installed_extensions(app: FastAPI):
             installed = check_installed_extension(ext)
             if not installed:
                 await restore_installed_extension(app, ext)
-                logger.info(f"✔️ Successfully re-installed extension: {ext.id}")
+                logger.info(
+                    f"✔️ Successfully re-installed extension: {ext.id} ({ext.installed_version})"
+                )
         except Exception as e:
             logger.warning(e)
-            logger.warning(f"Failed to re-install extension: {ext.id}")
+            logger.warning(
+                f"Failed to re-install extension: {ext.id} ({ext.installed_version})"
+            )
 
 
 async def build_all_installed_extensions_list() -> List[InstallableExtension]:

lnbits/core/crud.py

@@ -336,7 +336,7 @@ async def get_latest_payments_by_extension(ext_name: str, ext_id: str, limit: in
     rows = await db.fetchall(
         f"""
         SELECT * FROM apipayments
-        WHERE pending = 'false'
+        WHERE pending = false
         AND extra LIKE ?
         AND extra LIKE ?
         ORDER BY time DESC LIMIT {limit}

lnbits/core/services.py

@@ -247,6 +247,15 @@ async def pay_invoice(
                     new_checking_id=payment.checking_id,
                     conn=conn,
                 )
+                wallet = await get_wallet(wallet_id, conn=conn)
+                if wallet:
+                    await websocketUpdater(
+                        wallet_id,
+                        {
+                            "wallet_balance": wallet.balance or None,
+                            "payment": payment._asdict(),
+                        },
+                    )
                 logger.debug(f"payment successful {payment.checking_id}")
         elif payment.checking_id is None and payment.ok is False:
             # payment failed

lnbits/core/static/js/service-worker.js

@@ -1,6 +1,6 @@
 // update cache version every time there is a new deployment
 // so the service worker reinitializes the cache
-const CACHE_VERSION = 18
+const CACHE_VERSION = 30
 const CURRENT_CACHE = `lnbits-${CACHE_VERSION}-`
 
 const getApiKey = request => {

lnbits/core/static/js/wallet.js

@@ -145,12 +145,6 @@ new Vue({
       payments: [],
       paymentsTable: {
         columns: [
-          {
-            name: 'memo',
-            align: 'left',
-            label: this.$t('memo'),
-            field: 'memo'
-          },
           {
             name: 'time',
             align: 'left',
@@ -158,18 +152,19 @@ new Vue({
             field: 'date',
             sortable: true
           },
+          {
+            name: 'memo',
+            align: 'left',
+            label: this.$t('memo'),
+            field: 'date',
+            sortable: true
+          },
           {
             name: 'amount',
             align: 'right',
             label: this.$t('amount') + ' (' + LNBITS_DENOMINATION + ')',
             field: 'sat',
             sortable: true
-          },
-          {
-            name: 'fee',
-            align: 'right',
-            label: this.$t('fee') + ' (m' + LNBITS_DENOMINATION + ')',
-            field: 'fee'
           }
         ],
         pagination: {

lnbits/core/tasks.py

@@ -7,7 +7,7 @@ from loguru import logger
 from lnbits.tasks import SseListenersDict, register_invoice_listener
 
 from . import db
-from .crud import get_balance_notify
+from .crud import get_balance_notify, get_wallet
 from .models import Payment
 from .services import websocketUpdater
 
@@ -38,8 +38,15 @@ async def wait_for_paid_invoices(invoice_paid_queue: asyncio.Queue):
         logger.trace("received invoice paid event")
         # send information to sse channel
         await dispatch_api_invoice_listeners(payment)
-        await websocketUpdater(payment.wallet_id, payment.dict())
-
+        wallet = await get_wallet(payment.wallet_id)
+        if wallet:
+            await websocketUpdater(
+                payment.wallet_id,
+                {
+                    "wallet_balance": wallet.balance or None,
+                    "payment": payment._asdict(),
+                },
+            )
         # dispatch webhook
         if payment.webhook and not payment.webhook_status:
             await dispatch_webhook(payment)

lnbits/core/templates/core/index.html

@@ -150,6 +150,17 @@
             </a>
           </div>
         </div>
+        <div class="row">
+          <div class="col">
+            <a href="https://voltage.cloud">
+              <q-img
+                contain
+                :src="($q.dark.isActive) ? '/static/images/voltage.png' : '/static/images/voltagel.png'"
+              ></q-img>
+            </a>
+          </div>
+          <div class="col q-pl-md"></div>
+        </div>
       </div>
 
       {% if AD_SPACE %} {% for ADS in AD_SPACE %} {% set AD = ADS.split(';') %}

lnbits/core/templates/core/wallet.html

@@ -149,7 +149,6 @@
               {% raw %}
               <template v-slot:header="props">
                 <q-tr :props="props">
-                  <q-th auto-width></q-th>
                   <q-th v-for="col in props.cols" :key="col.name" :props="props"
                     >{{ col.label }}</q-th
                   >
@@ -192,11 +191,11 @@
                       </a>
                     </q-badge>
                     {{ props.row.memo }}
-                  </q-td>
-                  <q-td auto-width key="time" :props="props">
+                    <br />
                     <q-tooltip>{{ props.row.date }}</q-tooltip>
-                    {{ props.row.dateFrom }}
+                    <i> {{ props.row.dateFrom }}</i>
                   </q-td>
+
                   {% endraw %}
                   <q-td
                     auto-width
@@ -209,10 +208,8 @@
                   </q-td>
 
                   <q-td auto-width key="amount" v-else :props="props">
-                    {{ props.row.fsat }}
-                  </q-td>
-                  <q-td auto-width key="fee" :props="props">
-                    {{ props.row.fee }}
+                    {{ props.row.fsat }}<br />
+                    <i>fee {{ props.row.fee }}</i>
                   </q-td>
                 </q-tr>
 
@@ -552,7 +549,7 @@
             </h6>
             <q-separator class="q-my-sm"></q-separator>
             <p class="text-wrap">
-              <strong v-text="$t('description')">:</strong> {{
+              <strong v-text="$t('memo')">:</strong> {{
               parse.invoice.description }}<br />
               <strong>Expire date:</strong> {{ parse.invoice.expireDate }}<br />
               <strong>Hash:</strong> {{ parse.invoice.hash }}

lnbits/core/views/api.py

@@ -820,7 +820,7 @@ async def api_install_extension(
         ext_info.clean_extension_files()
         raise HTTPException(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail="Failed to install extension.",
+            detail=f"Failed to install extension {ext_info.id} ({ext_info.installed_version}).",
         )
 
 

lnbits/db.py

@@ -11,7 +11,7 @@ from sqlite3 import Row
 from typing import Any, Generic, List, Literal, Optional, Type, TypeVar
 
 from loguru import logger
-from pydantic import BaseModel, ValidationError
+from pydantic import BaseModel, ValidationError, root_validator
 from sqlalchemy import create_engine
 from sqlalchemy_aio.base import AsyncConnection
 from sqlalchemy_aio.strategy import ASYNCIO_STRATEGY
@@ -344,6 +344,7 @@ class FromRowModel(BaseModel):
 
 class FilterModel(BaseModel):
     __search_fields__: List[str] = []
+    __sort_fields__: Optional[List[str]] = None
 
 
 T = TypeVar("T")
@@ -427,6 +428,14 @@ class Filter(BaseModel, Generic[TFilterModel]):
 
 
 class Filters(BaseModel, Generic[TFilterModel]):
+    """
+    Generic helper class for filtering and sorting data.
+    For usage in an api endpoint, use the `parse_filters` dependency.
+
+    When constructing this class manually always make sure to pass a model so that the values can be validated.
+    Otherwise, make sure to validate the inputs manually.
+    """
+
     filters: List[Filter[TFilterModel]] = []
     search: Optional[str] = None
 
@@ -438,6 +447,18 @@ class Filters(BaseModel, Generic[TFilterModel]):
 
     model: Optional[Type[TFilterModel]] = None
 
+    @root_validator(pre=True)
+    def validate_sortby(cls, values):
+        sortby = values.get("sortby")
+        model = values.get("model")
+        if sortby and model:
+            model = values["model"]
+            # if no sort fields are specified explicitly all fields are allowed
+            allowed = model.__sort_fields__ or model.__fields__
+            if sortby not in allowed:
+                raise ValueError("Invalid sort field")
+        return values
+
     def pagination(self) -> str:
         stmt = ""
         if self.limit:

lnbits/extension_manager.py

@@ -353,8 +353,14 @@ class InstallableExtension(BaseModel):
             return False
         return Path(self.ext_dir, "config.json").is_file()
 
+    @property
+    def installed_version(self) -> str:
+        if self.installed_release:
+            return self.installed_release.version
+        return ""
+
     def download_archive(self):
-        logger.info(f"Downloading extension {self.name}.")
+        logger.info(f"Downloading extension {self.name} ({self.installed_version}).")
         ext_zip_file = self.zip_path
         if ext_zip_file.is_file():
             os.remove(ext_zip_file)
@@ -379,7 +385,7 @@ class InstallableExtension(BaseModel):
             )
 
     def extract_archive(self):
-        logger.info(f"Extracting extension {self.name}.")
+        logger.info(f"Extracting extension {self.name} ({self.installed_version}).")
         Path("lnbits", "upgrades").mkdir(parents=True, exist_ok=True)
         shutil.rmtree(self.ext_upgrade_dir, True)
         with zipfile.ZipFile(self.zip_path, "r") as zip_ref:
@@ -414,7 +420,7 @@ class InstallableExtension(BaseModel):
             Path(self.ext_upgrade_dir, self.id),
             Path(settings.lnbits_path, "extensions", self.id),
         )
-        logger.success(f"Extension {self.name} installed.")
+        logger.success(f"Extension {self.name} ({self.installed_version}) installed.")
 
     def nofiy_upgrade(self) -> None:
         """Update the list of upgraded extensions. The middleware will perform redirects based on this"""

lnbits/static/i18n/br.js

@@ -0,0 +1,88 @@
+window.localisation.br = {
+  server: 'Servidor',
+  theme: 'Tema',
+  funding: 'Financiamento',
+  users: 'Usuários',
+  restart: 'Reiniciar servidor',
+  save: 'Salvar',
+  save_tooltip: 'Salvar suas alterações',
+  topup: 'Recarregar',
+  topup_wallet: 'Recarregar uma carteira',
+  topup_hint: 'Use o ID da carteira para recarregar qualquer carteira',
+  restart_tooltip: 'Reinicie o servidor para que as alterações tenham efeito',
+  add_funds_tooltip: 'Adicionar fundos a uma carteira.',
+  reset_defaults: 'Redefinir para padrões',
+  reset_defaults_tooltip:
+    'Apagar todas as configurações e redefinir para os padrões.',
+  download_backup: 'Fazer backup do banco de dados',
+  name_your_wallet: 'Nomeie sua carteira %{name}',
+  paste_invoice_label: 'Cole uma fatura, pedido de pagamento ou código lnurl *',
+  lnbits_description:
+    'Fácil de configurar e leve, o LNbits pode ser executado em qualquer fonte de financiamento da lightning-network, atualmente suportando LND, c-lightning, OpenNode, LNPay e até mesmo o LNbits em si! Você pode executar o LNbits para si mesmo ou oferecer facilmente uma solução de custódia para outros. Cada carteira tem suas próprias chaves de API e não há limite para o número de carteiras que você pode criar. Ser capaz de particionar fundos torna o LNbits uma ferramenta útil para gerenciamento de dinheiro e como uma ferramenta de desenvolvimento. As extensões adicionam funcionalidades extras ao LNbits para que você possa experimentar uma série de tecnologias de ponta na rede lightning. Nós tornamos o desenvolvimento de extensões o mais fácil possível e, como um projeto gratuito e de código aberto, incentivamos as pessoas a desenvolver e enviar as suas próprias.',
+  export_to_phone: 'Exportar para o telefone com código QR',
+  export_to_phone_desc:
+    'Este código QR contém a URL da sua carteira com acesso total. Você pode escaneá-lo do seu telefone para abrir sua carteira a partir dele.',
+  wallets: 'Carteiras',
+  add_wallet: 'Adicionar nova carteira',
+  delete_wallet: 'Excluir carteira',
+  delete_wallet_desc:
+    'Toda a carteira será excluída, os fundos serão IRRECUPERÁVEIS.',
+  rename_wallet: 'Renomear carteira',
+  update_name: 'Atualizar nome',
+  press_to_claim: 'Pressione para solicitar bitcoin',
+  donate: 'Doar',
+  view_github: 'Ver no GitHub',
+  voidwallet_active: 'VoidWallet está ativo! Pagamentos desabilitados',
+  use_with_caution: 'USE COM CAUTELA - a carteira %{name} ainda está em BETA',
+  toggle_darkmode: 'Alternar modo escuro',
+  view_swagger_docs: 'Ver a documentação da API do LNbits Swagger',
+  api_docs: 'Documentação da API',
+  commit_version: 'Versão de commit',
+  lnbits_version: 'Versão do LNbits',
+  runs_on: 'Executa em',
+  credit_hint: 'Pressione Enter para creditar a conta',
+  credit_label: '%{denomination} para creditar',
+  paste_request: 'Colar Pedido',
+  create_invoice: 'Criar Fatura',
+  camera_tooltip: 'Usar a câmara para escanear uma fatura / QR',
+  export_csv: 'Exportar para CSV',
+  transactions: 'Transações',
+  chart_tooltip: 'Mostrar gráfico',
+  pending: 'Pendente',
+  copy_invoice: 'Copiar fatura',
+  close: 'Fechar',
+  cancel: 'Cancelar',
+  scan: 'Escanear',
+  read: 'Ler',
+  pay: 'Pagar',
+  memo: 'Memo',
+  date: 'Data',
+  processing_payment: 'Processando pagamento...',
+  not_enough_funds: 'Fundos insuficientes!',
+  search_by_tag_memo_amount: 'Pesquisar por tag, memo, quantidade',
+  invoice_waiting: 'Fatura aguardando pagamento',
+  payment_received: 'Pagamento Recebido',
+  payment_sent: 'Pagamento Enviado',
+  outgoing_payment_pending: 'Pagamento pendente de saída',
+  drain_funds: 'Drenar Fundos',
+  drain_funds_desc:
+    'Este é um código QR de retirada do LNURL para sugar tudo desta carteira. Não compartilhe com ninguém. É compatível com balanceCheck e balanceNotify para que sua carteira possa continuar retirando os fundos continuamente daqui após a primeira retirada.',
+  i_understand: 'Eu entendo',
+  copy_wallet_url: 'Copiar URL da carteira',
+  disclaimer_dialog:
+    'Funcionalidade de login a ser lançada em uma atualização futura, por enquanto, certifique-se de marcar esta página para acesso futuro à sua carteira! Este serviço está em BETA, e não nos responsabilizamos por pessoas que perderem o acesso aos fundos.',
+  no_transactions: 'Ainda não foram feitas transações',
+  manage_extensions: 'Gerenciar extensões',
+  manage_server: 'Gerenciar servidor',
+  extensions: 'Extensões',
+  no_extensions: 'Você não possui nenhuma extensão instalada :(',
+  created: 'Criado',
+  payment_hash: 'Hash de pagamento',
+  fee: 'Taxa',
+  amount: 'Quantidade',
+  unit: 'Unidade',
+  description: 'Descrição',
+  expiry: 'Validade',
+  webhook: 'Webhook',
+  payment_proof: 'Comprovante de pagamento'
+}

lnbits/static/i18n/de.js

@@ -14,16 +14,16 @@ window.localisation.de = {
   add_funds_tooltip: 'Füge Geld zu einer Wallet hinzu.',
   reset_defaults: 'Zurücksetzen',
   reset_defaults_tooltip:
-    'Alle Einstellungen zurücksetzen auf die Standardeinstellungen.',
+    'Alle Einstellungen auf die Standardeinstellungen zurücksetzen.',
   download_backup: 'Datenbank-Backup herunterladen',
   name_your_wallet: 'Vergib deiner %{name} Wallet einen Namen',
   paste_invoice_label:
-    'Füge eine Rechnung, Zahlungsanforderung oder lnurl ein *',
+    'Füge eine Rechnung, Zahlungsanforderung oder LNURL ein *',
   lnbits_description:
-    'Einfach zu installieren und kompakt, LNbits kann auf jeder Funding-Quelle im Lightning Netzwerk aufsetzen. Derzeit unterstützt: LND, c-lightning, OpenNode, LNPay und sogar LNbits selbst! Du kannst LNbits für dich selbst betreiben oder anderen die Verwaltung durch dich anbieten. Jede Wallet hat ihre eigenen API-Schlüssel und die Anzahl der Wallets ist unbegrenzt. Die Möglichkeit, Gelder auf verschiedene Accounts mit unterschiedlicher Logik aufteilen zu können macht LNbits zu einem nützlichen Werkzeug für deine Buchhaltung - aber auch als Entwicklungswerkzeug. Erweiterungen bereichern LNbits Accounts um zusätzliche Funktionalität, so dass du mit einer Reihe von neuartigen Technologien auf dem Lightning-Netzwerk experimentieren kannst. Wir haben es so einfach wie möglich gemacht, Erweiterungen zu entwickeln, und als freies und Open-Source-Projekt möchten wir Menschen ermutigen, sich selbst hieran zu versuchen und gemeinsam mit uns neue Funktionalitäten zu entwickeln.',
+    'Einfach zu installieren und kompakt, LNbits kann auf jeder Funding-Quelle im Lightning Netzwerk aufsetzen. Derzeit unterstützt: LND, Core Lightning, OpenNode, LNPay und sogar LNbits selbst! Du kannst LNbits für dich selbst betreiben oder anderen die Verwaltung durch dich anbieten. Jede Wallet hat ihre eigenen API-Schlüssel und die Anzahl der Wallets ist unbegrenzt. Die Möglichkeit, Gelder auf verschiedene Accounts mit unterschiedlicher Logik aufteilen zu können macht LNbits zu einem nützlichen Werkzeug für deine Buchhaltung - aber auch als Entwicklungswerkzeug. Erweiterungen bereichern LNbits Accounts um zusätzliche Funktionalität, so dass du mit einer Reihe von neuartigen Technologien auf dem Lightning-Netzwerk experimentieren kannst. Wir haben es so einfach wie möglich gemacht, Erweiterungen zu entwickeln, und als freies und Open-Source-Projekt möchten wir Menschen ermutigen, sich selbst hieran zu versuchen und gemeinsam mit uns neue Funktionalitäten zu entwickeln.',
   export_to_phone: 'Auf dem Telefon öffnen',
   export_to_phone_desc:
-    'Dieser QR-Code beinhaltet vollständige Rechte auf deine Wallet. Du kannste den QR-Code mit Deinem Telefon scannen, um deine Wallet dort zu öffnen.',
+    'Dieser QR-Code beinhaltet vollständige Rechte auf deine Wallet. Du kannst den QR-Code mit Deinem Telefon scannen, um deine Wallet dort zu öffnen.',
   wallets: 'Wallets',
   add_wallet: 'Wallet hinzufügen',
   delete_wallet: 'Wallet löschen',
@@ -35,7 +35,8 @@ window.localisation.de = {
   donate: 'Spenden',
   view_github: 'Auf GitHub anzeigen',
   voidwallet_active: 'VoidWallet ist aktiv! Zahlungen deaktiviert',
-  use_with_caution: 'BITTE MIT VORSICHT BENUTZEN- %{name} Wallet ist noch BETA',
+  use_with_caution:
+    'BITTE MIT VORSICHT BENUTZEN - %{name} Wallet ist noch BETA',
   toggle_darkmode: 'Auf Dark Mode umschalten',
   view_swagger_docs: 'LNbits Swagger API-Dokumente',
   api_docs: 'API docs',
@@ -46,7 +47,7 @@ window.localisation.de = {
   paste_request: 'Anfrage einfügen',
   create_invoice: 'Rechnung erstellen',
   camera_tooltip:
-    'Verwenden Sie die Kamera, um eine Rechnung oder einen QR-Code zu scannen',
+    'Verwende die Kamera, um eine Rechnung oder einen QR-Code zu scannen',
   export_csv: 'Exportieren als CSV',
   transactions: 'Transaktionen',
   chart_tooltip: 'Diagramm anzeigen',
@@ -68,7 +69,7 @@ window.localisation.de = {
   outgoing_payment_pending: 'Ausgehende Zahlung wartend',
   drain_funds: 'Sats abziehen',
   drain_funds_desc:
-    'LNURL-withdraw QR-Code, der das Abziehen aller Geldmittel aus dieser Wallet erlaubt. Teile ihn mit niemandem! Kompatibel mit balanceCheck und balanceNotify, so dass deine Brieftasche die Sats nach dem ersten Abzug kontinuierlich von hier abziehen kann.',
+    'LNURL-withdraw QR-Code, der das Abziehen aller Geldmittel aus dieser Wallet erlaubt. Teile ihn mit niemandem! Kompatibel mit balanceCheck und balanceNotify, so dass dein Wallet die Sats nach dem ersten Abzug kontinuierlich von hier abziehen kann.',
   i_understand: 'Ich verstehe',
   copy_wallet_url: 'Wallet-URL kopieren',
   disclaimer_dialog:
@@ -84,7 +85,7 @@ window.localisation.de = {
   warning: 'Warnung',
   manage: 'Verwalten',
   repository: 'Repository',
-  confirm_continue: 'Sind Sie sicher, dass Sie fortfahren möchten?',
+  confirm_continue: 'Bist du sicher, dass du fortfahren möchtest?',
   manage_extension_details: 'Erweiterung installieren/deinstallieren',
   install: 'Installieren',
   uninstall: 'Deinstallieren',
@@ -104,7 +105,7 @@ window.localisation.de = {
     '(Nur Administratorkonten können Erweiterungen installieren)',
   new_version: 'Neue Version',
   extension_depends_on: 'Hängt ab von:',
-  extension_rating_soon: 'Bewertungen kommen bald',
+  extension_rating_soon: 'Bewertungen sind bald verfügbar',
   extension_installed_version: 'Installierte Version',
   extension_uninstall_warning:
     'Sie sind dabei, die Erweiterung für alle Benutzer zu entfernen.',

lnbits/static/i18n/en.js

@@ -17,7 +17,7 @@ window.localisation.en = {
   name_your_wallet: 'Name your %{name} wallet',
   paste_invoice_label: 'Paste an invoice, payment request or lnurl code *',
   lnbits_description:
-    'Easy to set up and lightweight, LNbits can run on any lightning-network funding source, currently supporting LND, c-lightning, OpenNode, LNPay and even LNbits itself! You can run LNbits for yourself, or easily offer a custodian solution for others. Each wallet has its own API keys and there is no limit to the number of wallets you can make. Being able to partition funds makes LNbits a useful tool for money management and as a development tool. Extensions add extra functionality to LNbits so you can experiment with a range of cutting-edge technologies on the lightning network. We have made developing extensions as easy as possible, and as a free and open-source project, we encourage people to develop and submit their own.',
+    'Easy to set up and lightweight, LNbits can run on any lightning-network funding source, currently supporting LND, Core Lightning, OpenNode, LNPay and even LNbits itself! You can run LNbits for yourself, or easily offer a custodian solution for others. Each wallet has its own API keys and there is no limit to the number of wallets you can make. Being able to partition funds makes LNbits a useful tool for money management and as a development tool. Extensions add extra functionality to LNbits so you can experiment with a range of cutting-edge technologies on the lightning network. We have made developing extensions as easy as possible, and as a free and open-source project, we encourage people to develop and submit their own.',
   export_to_phone: 'Export to Phone with QR Code',
   export_to_phone_desc:
     'This QR code contains your wallet URL with full access. You can scan it from your phone to open your wallet from there.',

lnbits/static/i18n/es.js

@@ -19,7 +19,7 @@ window.localisation.es = {
   name_your_wallet: 'Nombre de su billetera %{name}',
   paste_invoice_label: 'Pegue la factura aquí',
   lnbits_description:
-    'Fácil de instalar y liviano, LNbits puede ejecutarse en cualquier fuente de financiación de la red Lightning, actualmente compatible con LND, c-lightning, OpenNode, LNPay y hasta LNbits mismo! Puede ejecutar LNbits para usted mismo o ofrecer una solución competente a otros. Cada billetera tiene su propia clave API y no hay límite para la cantidad de billeteras que puede crear. La capacidad de particionar fondos hace de LNbits una herramienta útil para la administración de fondos y como herramienta de desarrollo. Las extensiones agregan funcionalidad adicional a LNbits, por lo que puede experimentar con una variedad de tecnologías de vanguardia en la red Lightning. Lo hemos hecho lo más simple posible para desarrollar extensiones y, como un proyecto gratuito y de código abierto, animamos a las personas a que se desarrollen a sí mismas y envíen sus propios contribuciones.',
+    'Fácil de instalar y liviano, LNbits puede ejecutarse en cualquier fuente de financiación de la red Lightning, actualmente compatible con LND, Core Lightning, OpenNode, LNPay y hasta LNbits mismo! Puede ejecutar LNbits para usted mismo o ofrecer una solución competente a otros. Cada billetera tiene su propia clave API y no hay límite para la cantidad de billeteras que puede crear. La capacidad de particionar fondos hace de LNbits una herramienta útil para la administración de fondos y como herramienta de desarrollo. Las extensiones agregan funcionalidad adicional a LNbits, por lo que puede experimentar con una variedad de tecnologías de vanguardia en la red Lightning. Lo hemos hecho lo más simple posible para desarrollar extensiones y, como un proyecto gratuito y de código abierto, animamos a las personas a que se desarrollen a sí mismas y envíen sus propios contribuciones.',
   export_to_phone: 'Exportar a teléfono con código QR',
   export_to_phone_desc:
     'Este código QR contiene su URL de billetera con acceso completo. Puede escanearlo desde su teléfono para abrir su billetera allí.',

lnbits/static/i18n/fr.js

@@ -21,7 +21,7 @@ window.localisation.fr = {
   paste_invoice_label:
     'Coller une facture, une demande de paiement ou un code lnurl *',
   lnbits_description:
-    "Facile à installer et léger, LNbits peut fonctionner sur n'importe quelle source de financement du réseau Lightning, prenant actuellement en charge LND, c-lightning, OpenNode, LNPay et même LNbits lui-même! Vous pouvez exécuter LNbits pour vous-même ou offrir facilement une solution de gardien pour les autres. Chaque portefeuille a ses propres clés API et il n'y a pas de limite au nombre de portefeuilles que vous pouvez créer. La capacité de partitionner les fonds rend LNbits un outil utile pour la gestion de l'argent et comme outil de développement. Les extensions ajoutent une fonctionnalité supplémentaire à LNbits afin que vous puissiez expérimenter une gamme de technologies de pointe sur le réseau Lightning. Nous avons rendu le développement d'extensions aussi simple que possible et, en tant que projet gratuit et open source, nous encourageons les gens à développer et à soumettre les leurs.",
+    "Facile à installer et léger, LNbits peut fonctionner sur n'importe quelle source de financement du réseau Lightning, prenant actuellement en charge LND, Core Lightning, OpenNode, LNPay et même LNbits lui-même! Vous pouvez exécuter LNbits pour vous-même ou offrir facilement une solution de gardien pour les autres. Chaque portefeuille a ses propres clés API et il n'y a pas de limite au nombre de portefeuilles que vous pouvez créer. La capacité de partitionner les fonds rend LNbits un outil utile pour la gestion de l'argent et comme outil de développement. Les extensions ajoutent une fonctionnalité supplémentaire à LNbits afin que vous puissiez expérimenter une gamme de technologies de pointe sur le réseau Lightning. Nous avons rendu le développement d'extensions aussi simple que possible et, en tant que projet gratuit et open source, nous encourageons les gens à développer et à soumettre les leurs.",
   export_to_phone: 'Exporter vers le téléphone avec un code QR',
   export_to_phone_desc:
     "Ce code QR contient l'URL de votre portefeuille avec un accès complet. Vous pouvez le scanner depuis votre téléphone pour ouvrir votre portefeuille depuis là-bas.",

lnbits/static/i18n/it.js

@@ -19,7 +19,7 @@ window.localisation.it = {
   paste_invoice_label:
     'Incolla una fattura, una richiesta di pagamento o un codice lnurl *',
   lnbits_description:
-    "Leggero e facile da configurare, LNbits può funzionare su qualsiasi fonte di finanziamento lightning-network, attualmente supporta LND, c-lightning, OpenNode, LNPay e persino LNbits stesso! Potete gestire LNbits per conto vostro o offrire facilmente una soluzione di custodia per altri. Ogni portafoglio ha le proprie chiavi API e non c'è limite al numero di portafogli che si possono creare. La possibilità di suddividere i fondi rende LNbits uno strumento utile per la gestione del denaro e come strumento di sviluppo. Le estensioni aggiungono ulteriori funzionalità a LNbits, consentendo di sperimentare una serie di tecnologie all'avanguardia sulla rete Lightning. Abbiamo reso lo sviluppo delle estensioni il più semplice possibile e, in quanto progetto libero e open-source, incoraggiamo le persone a sviluppare e inviare le proprie",
+    "Leggero e facile da configurare, LNbits può funzionare su qualsiasi fonte di finanziamento lightning-network, attualmente supporta LND, Core Lightning, OpenNode, LNPay e persino LNbits stesso! Potete gestire LNbits per conto vostro o offrire facilmente una soluzione di custodia per altri. Ogni portafoglio ha le proprie chiavi API e non c'è limite al numero di portafogli che si possono creare. La possibilità di suddividere i fondi rende LNbits uno strumento utile per la gestione del denaro e come strumento di sviluppo. Le estensioni aggiungono ulteriori funzionalità a LNbits, consentendo di sperimentare una serie di tecnologie all'avanguardia sulla rete Lightning. Abbiamo reso lo sviluppo delle estensioni il più semplice possibile e, in quanto progetto libero e open-source, incoraggiamo le persone a sviluppare e inviare le proprie",
   export_to_phone: 'Esportazione su telefono con codice QR',
   export_to_phone_desc:
     "Questo codice QR contiene l'URL del portafoglio con accesso da amministratore. È possibile scansionarlo dal telefono per aprire il portafoglio da lì.",

lnbits/static/i18n/jp.js

@@ -18,7 +18,7 @@ window.localisation.jp = {
   name_your_wallet: 'あなたのウォレットの名前 %{name}',
   paste_invoice_label: '請求書を貼り付けてください',
   lnbits_description:
-    '簡単にインストールでき、軽量で、LNbitsは現在LND、c-lightning、OpenNode、LNPay、さらにLNbits自身で動作する任意のLightningネットワークの資金源で実行できます！ LNbitsを自分で実行することも、他の人に優れたソリューションを提供することもできます。各ウォレットには独自のAPIキーがあり、作成できるウォレットの数に制限はありません。資金を分割する機能は、LNbitsを資金管理ツールとして使用したり、開発ツールとして使用したりするための便利なツールです。拡張機能は、LNbitsに追加の機能を追加します。そのため、LNbitsは最先端の技術をネットワークLightningで試すことができます。拡張機能を開発するのは簡単で、無料でオープンソースのプロジェクトであるため、人々が自分で開発し、自分の貢献を送信することを奨励しています。',
+    '簡単にインストールでき、軽量で、LNbitsは現在LND、Core Lightning、OpenNode、LNPay、さらにLNbits自身で動作する任意のLightningネットワークの資金源で実行できます！ LNbitsを自分で実行することも、他の人に優れたソリューションを提供することもできます。各ウォレットには独自のAPIキーがあり、作成できるウォレットの数に制限はありません。資金を分割する機能は、LNbitsを資金管理ツールとして使用したり、開発ツールとして使用したりするための便利なツールです。拡張機能は、LNbitsに追加の機能を追加します。そのため、LNbitsは最先端の技術をネットワークLightningで試すことができます。拡張機能を開発するのは簡単で、無料でオープンソースのプロジェクトであるため、人々が自分で開発し、自分の貢献を送信することを奨励しています。',
   export_to_phone: '電話にエクスポート',
   export_to_phone_desc:
     'ウォレットを電話にエクスポートすると、ウォレットを削除する前にウォレットを復元できます。ウォレットを削除すると、ウォレットの秘密鍵が削除され、ウォレットを復元することはできません。',

lnbits/static/i18n/nl.js

@@ -19,7 +19,7 @@ window.localisation.nl = {
   name_your_wallet: 'Geef je %{name} portemonnee een naam',
   paste_invoice_label: 'Plak een factuur, betalingsverzoek of lnurl-code*',
   lnbits_description:
-    'Gemakkelijk in te stellen en lichtgewicht, LNbits kan op elke lightning-netwerkfinancieringsbron draaien, ondersteunt op dit moment LND, c-lightning, OpenNode, LNPay en zelfs LNbits zelf! U kunt LNbits voor uzelf laten draaien of gemakkelijk een bewaardersoplossing voor anderen bieden. Elke portemonnee heeft zijn eigen API-sleutels en er is geen limiet aan het aantal portemonnees dat u kunt maken. Het kunnen partitioneren van fondsen maakt LNbits een nuttige tool voor geldbeheer en als ontwikkelingstool. Extensies voegen extra functionaliteit toe aan LNbits, zodat u kunt experimenteren met een reeks toonaangevende technologieën op het bliksemschichtnetwerk. We hebben het ontwikkelen van extensies zo eenvoudig mogelijk gemaakt en als een gratis en opensource-project moedigen we mensen aan om hun eigen ontwikkelingen in te dienen.',
+    'Gemakkelijk in te stellen en lichtgewicht, LNbits kan op elke lightning-netwerkfinancieringsbron draaien, ondersteunt op dit moment LND, Core Lightning, OpenNode, LNPay en zelfs LNbits zelf! U kunt LNbits voor uzelf laten draaien of gemakkelijk een bewaardersoplossing voor anderen bieden. Elke portemonnee heeft zijn eigen API-sleutels en er is geen limiet aan het aantal portemonnees dat u kunt maken. Het kunnen partitioneren van fondsen maakt LNbits een nuttige tool voor geldbeheer en als ontwikkelingstool. Extensies voegen extra functionaliteit toe aan LNbits, zodat u kunt experimenteren met een reeks toonaangevende technologieën op het bliksemschichtnetwerk. We hebben het ontwikkelen van extensies zo eenvoudig mogelijk gemaakt en als een gratis en opensource-project moedigen we mensen aan om hun eigen ontwikkelingen in te dienen.',
   export_to_phone: 'Exporteren naar telefoon met QR-code',
   export_to_phone_desc:
     'Deze QR-code bevat uw portemonnee-URL met volledige toegang. U kunt het vanaf uw telefoon scannen om uw portemonnee van daaruit te openen.',

lnbits/static/i18n/pi.js

@@ -18,7 +18,7 @@ window.localisation.pi = {
   name_your_wallet: 'Name yer %{name} treasure chest',
   paste_invoice_label: 'Paste a booty, payment request or lnurl code, matey!',
   lnbits_description:
-    'Arr, easy to set up and lightweight, LNbits can run on any lightning-network funding source, currently supporting LND, c-lightning, OpenNode, LNPay and even LNbits itself! Ye can run LNbits for yourself, or easily offer a custodian solution for others. Each chest has its own API keys and there be no limit to the number of chests ye can make. Being able to partition booty makes LNbits a useful tool for money management and as a development tool. Arr, extensions add extra functionality to LNbits so ye can experiment with a range of cutting-edge technologies on the lightning network. We have made developing extensions as easy as possible, and as a free and open-source project, we encourage scallywags to develop and submit their own.',
+    'Arr, easy to set up and lightweight, LNbits can run on any lightning-network funding source, currently supporting LND, Core Lightning, OpenNode, LNPay and even LNbits itself! Ye can run LNbits for yourself, or easily offer a custodian solution for others. Each chest has its own API keys and there be no limit to the number of chests ye can make. Being able to partition booty makes LNbits a useful tool for money management and as a development tool. Arr, extensions add extra functionality to LNbits so ye can experiment with a range of cutting-edge technologies on the lightning network. We have made developing extensions as easy as possible, and as a free and open-source project, we encourage scallywags to develop and submit their own.',
   export_to_phone: 'Export to Phone with QR Code, me hearties',
   export_to_phone_desc:
     'This QR code contains yer chest URL with full access. Ye can scan it from yer phone to open yer chest from there, arr!',

lnbits/static/i18n/pl.js

@@ -17,7 +17,7 @@ window.localisation.pl = {
   name_your_wallet: 'Nazwij swój portfel %{name}',
   paste_invoice_label: 'Wklej fakturę, żądanie zapłaty lub kod lnurl *',
   lnbits_description:
-    'Łatwy i lekki w konfiguracji, LNbits może działać w oparciu o dowolne źródło finansowania w sieci lightning, obecnie wspiera LND, c-lightning, OpenNode, LNPay czy nawet inną instancję LNbits! Możesz uruchomić instancję LNbits dla siebie lub dla innych. Każdy portfel ma swoje klucze API i nie ma ograniczeń jeśli chodzi o ilość portfeli. LNbits umożliwia dzielenie środków w celu zarządzania nimi, jest również dobrym narzędziem deweloperskim. Rozszerzenia zwiększają funkcjonalność LNbits co umożliwia eksperymentowanie z nowym technologiami w sieci lightning. Tworzenie rozszerzeń jest proste dlatego zachęcamy innych deweloperów do tworzenia dodatkowych funkcjonalności i wysyłanie do nas PR',
+    'Łatwy i lekki w konfiguracji, LNbits może działać w oparciu o dowolne źródło finansowania w sieci lightning, obecnie wspiera LND, Core Lightning, OpenNode, LNPay czy nawet inną instancję LNbits! Możesz uruchomić instancję LNbits dla siebie lub dla innych. Każdy portfel ma swoje klucze API i nie ma ograniczeń jeśli chodzi o ilość portfeli. LNbits umożliwia dzielenie środków w celu zarządzania nimi, jest również dobrym narzędziem deweloperskim. Rozszerzenia zwiększają funkcjonalność LNbits co umożliwia eksperymentowanie z nowym technologiami w sieci lightning. Tworzenie rozszerzeń jest proste dlatego zachęcamy innych deweloperów do tworzenia dodatkowych funkcjonalności i wysyłanie do nas PR',
   export_to_phone: 'Eksport kodu QR na telefon',
   export_to_phone_desc:
     'Ten kod QR zawiera adres URL Twojego portfela z pełnym dostępem do niego. Możesz go zeskanować na swoim telefonie aby otworzyć na nim ten portfel.',

lnbits/static/i18n/pt.js

@@ -0,0 +1,88 @@
+window.localisation.pt = {
+  server: 'Servidor',
+  theme: 'Tema',
+  funding: 'Financiamento',
+  users: 'Usuários',
+  restart: 'Reiniciar servidor',
+  save: 'Gravar',
+  save_tooltip: 'Gravar as alterações',
+  topup: 'Reforçar conta',
+  topup_wallet: 'Recarregar uma carteira',
+  topup_hint: 'Use o ID da carteira para recarregar qualquer carteira',
+  restart_tooltip: 'Reinicie o servidor para que as alterações tenham efeito',
+  add_funds_tooltip: 'Adicionar fundos a uma carteira.',
+  reset_defaults: 'Redefinir para padrões',
+  reset_defaults_tooltip:
+    'Apagar todas as configurações e redefinir para os padrões.',
+  download_backup: 'Fazer backup da base de dados',
+  name_your_wallet: 'Nomeie sua carteira %{name}',
+  paste_invoice_label: 'Cole uma fatura, pedido de pagamento ou código lnurl *',
+  lnbits_description:
+    'Fácil de configurar e leve, o LNbits pode ser executado em qualquer fonte de financiamento da lightning-network, atualmente suportando LND, c-lightning, OpenNode, LNPay e até mesmo o LNbits em si! Você pode executar o LNbits para si mesmo ou oferecer facilmente uma solução de custódia para outros. Cada carteira tem suas próprias chaves de API e não há limite para o número de carteiras que você pode criar. Ser capaz de particionar fundos torna o LNbits uma ferramenta útil para gerenciamento de dinheiro e como uma ferramenta de desenvolvimento. As extensões adicionam funcionalidades extras ao LNbits para que você possa experimentar uma série de tecnologias de ponta na rede lightning. Nós tornamos o desenvolvimento de extensões o mais fácil possível e, como um projeto gratuito e de código aberto, incentivamos as pessoas a desenvolver e enviar as suas próprias.',
+  export_to_phone: 'Exportar para o telefone com código QR',
+  export_to_phone_desc:
+    'Este código QR contém a URL da sua carteira com acesso total. Você pode escaneá-lo do seu telefone para abrir sua carteira a partir dele.',
+  wallets: 'Carteiras',
+  add_wallet: 'Adicionar nova carteira',
+  delete_wallet: 'Excluir carteira',
+  delete_wallet_desc:
+    'Toda a carteira será excluída, os fundos serão IRRECUPERÁVEIS.',
+  rename_wallet: 'Renomear carteira',
+  update_name: 'Atualizar nome',
+  press_to_claim: 'Pressione para solicitar bitcoin',
+  donate: 'Doar',
+  view_github: 'Ver no GitHub',
+  voidwallet_active: 'VoidWallet está ativo! Pagamentos desabilitados',
+  use_with_caution: 'USE COM CAUTELA - a carteira %{name} ainda está em BETA',
+  toggle_darkmode: 'Alternar modo escuro',
+  view_swagger_docs: 'Ver a documentação da API do LNbits Swagger',
+  api_docs: 'Documentação da API',
+  commit_version: 'Versão de commit',
+  lnbits_version: 'Versão do LNbits',
+  runs_on: 'Executa em',
+  credit_hint: 'Pressione Enter para creditar a conta',
+  credit_label: '%{denomination} para creditar',
+  paste_request: 'Colar Pedido',
+  create_invoice: 'Criar Fatura',
+  camera_tooltip: 'Usar a câmara para escanear uma fatura / QR',
+  export_csv: 'Exportar para CSV',
+  transactions: 'Transações',
+  chart_tooltip: 'Mostrar gráfico',
+  pending: 'Pendente',
+  copy_invoice: 'Copiar fatura',
+  close: 'Fechar',
+  cancel: 'Cancelar',
+  scan: 'Escanear',
+  read: 'Ler',
+  pay: 'Pagar',
+  memo: 'Memo',
+  date: 'Data',
+  processing_payment: 'Processando pagamento...',
+  not_enough_funds: 'Fundos insuficientes!',
+  search_by_tag_memo_amount: 'Pesquisar por tag, memo, quantidade',
+  invoice_waiting: 'Fatura aguardando pagamento',
+  payment_received: 'Pagamento Recebido',
+  payment_sent: 'Pagamento Enviado',
+  outgoing_payment_pending: 'Pagamento de saída pendente',
+  drain_funds: 'Esvasiar carteira',
+  drain_funds_desc:
+    'Este é um código QR de saque LNURL para sacar tudo desta carteira. Não o partilhe com ninguém. É compatível com balanceCheck e balanceNotify para que a sua carteira possa continuar levantando os fundos continuamente daqui após o primeiro saque.',
+  i_understand: 'Eu entendo',
+  copy_wallet_url: 'Copiar URL da carteira',
+  disclaimer_dialog:
+    'Funcionalidade de login a ser lançada numa atualização futura, por enquanto, certifique-se que marca esta página para acesso futuro à sua carteira! Este serviço está em BETA, e não nos responsabilizamos por pessoas que perderem o acesso aos fundos.',
+  no_transactions: 'Ainda não foram feitas transações',
+  manage_extensions: 'Gerir extensões',
+  manage_server: 'Gerir servidor',
+  extensions: 'Extensões',
+  no_extensions: 'Não há nenhuma extensão instalada :(',
+  created: 'Criado',
+  payment_hash: 'Hash de pagamento',
+  fee: 'Taxa',
+  amount: 'Quantidade',
+  unit: 'Unidade',
+  description: 'Descrição',
+  expiry: 'Validade',
+  webhook: 'Webhook',
+  payment_proof: 'Comprovativo de pagamento'
+}

lnbits/static/i18n/we.js

@@ -17,7 +17,7 @@ window.localisation.we = {
   name_your_wallet: 'Enwch eich waled %{name}',
   paste_invoice_label: 'Gludwch anfoneb, cais am daliad neu god lnurl *',
   lnbits_description:
-    'Yn hawdd iw sefydlu ac yn ysgafn, gall LNbits redeg ar unrhyw ffynhonnell ariannu rhwydwaith mellt, ar hyn o bryd yn cefnogi LND, c-lightning, OpenNode, LNPay a hyd yn oed LNbits ei hun! Gallwch redeg LNbits i chi`ch hun, neu gynnig datrysiad ceidwad i eraill yn hawdd. Mae gan bob waled ei allweddi API ei hun ac nid oes cyfyngiad ar nifer y waledi y gallwch eu gwneud. Mae gallu rhannu cronfeydd yn gwneud LNbits yn arf defnyddiol ar gyfer rheoli arian ac fel offeryn datblygu. Mae estyniadau yn ychwanegu ymarferoldeb ychwanegol at LNbits fel y gallwch arbrofi gydag ystod o dechnolegau blaengar ar y rhwydwaith mellt. Rydym wedi gwneud datblygu estyniadau mor hawdd â phosibl, ac fel prosiect ffynhonnell agored am ddim, rydym yn annog pobl i ddatblygu a chyflwyno eu rhai eu hunain.',
+    'Yn hawdd iw sefydlu ac yn ysgafn, gall LNbits redeg ar unrhyw ffynhonnell ariannu rhwydwaith mellt, ar hyn o bryd yn cefnogi LND, Core Lightning, OpenNode, LNPay a hyd yn oed LNbits ei hun! Gallwch redeg LNbits i chi`ch hun, neu gynnig datrysiad ceidwad i eraill yn hawdd. Mae gan bob waled ei allweddi API ei hun ac nid oes cyfyngiad ar nifer y waledi y gallwch eu gwneud. Mae gallu rhannu cronfeydd yn gwneud LNbits yn arf defnyddiol ar gyfer rheoli arian ac fel offeryn datblygu. Mae estyniadau yn ychwanegu ymarferoldeb ychwanegol at LNbits fel y gallwch arbrofi gydag ystod o dechnolegau blaengar ar y rhwydwaith mellt. Rydym wedi gwneud datblygu estyniadau mor hawdd â phosibl, ac fel prosiect ffynhonnell agored am ddim, rydym yn annog pobl i ddatblygu a chyflwyno eu rhai eu hunain.',
   export_to_phone: 'Allforio i Ffôn gyda chod QR',
   export_to_phone_desc:
     'Mae`r cod QR hwn yn cynnwys URL eich waled gyda mynediad llawn. Gallwch ei sganio o`ch ffôn i agor eich waled oddi yno.',

lnbits/static/js/base.js

@@ -343,7 +343,8 @@ window.windowMixin = {
         user: null,
         wallet: null,
         payments: [],
-        allowedThemes: null
+        allowedThemes: null,
+        langs: []
       }
     }
   },
@@ -388,6 +389,8 @@ window.windowMixin = {
       window.i18n.locale = locale
     }
 
+    this.g.langs = window.langs ?? []
+
     addEventListener('offline', event => {
       this.g.offline = true
     })

lnbits/static/js/components.js

@@ -213,71 +213,73 @@ Vue.component('lnbits-payment-details', {
     }
   },
   template: `
-    <div class="q-py-md" style="text-align: left">
-      <div class="row justify-center q-mb-md">
-        <q-badge v-if="hasTag" color="yellow" text-color="black">
-          #{{ payment.tag }}
-        </q-badge>
-      </div>
-      <div class="row">
-        <div class="col-3"><b v-text="$t('created')"></b>:</div>
-        <div class="col-9">{{ payment.date }} ({{ payment.dateFrom }})</div>
-      </div>
-      <div class="row">
-        <div class="col-3"><b v-text="$t('expiry')"></b>:</div>
-        <div class="col-9">{{ payment.expirydate }} ({{ payment.expirydateFrom }})</div>
-      </div>
-      <div class="row">
-        <div class="col-3"><b v-text="$t('description')"></b>:</div>
-        <div class="col-9">{{ payment.memo }}</div>
-      </div>
-      <div class="row">
-        <div class="col-3"><b v-text="$t('amount')"></b>:</div>
-        <div class="col-9">{{ (payment.amount / 1000).toFixed(3) }} {{LNBITS_DENOMINATION}}</div>
-      </div>
-      <div class="row">
-        <div class="col-3"><b v-text="$t('fee')"></b>:</div>
-        <div class="col-9">{{ (payment.fee / 1000).toFixed(3) }} {{LNBITS_DENOMINATION}}</div>
-      </div>
-      <div class="row">
-        <div class="col-3"><b v-text="$t('payment_hash')"></b>:</div>
-        <div class="col-9 text-wrap mono">
-            {{ payment.payment_hash }}
-            <q-icon name="content_copy" @click="copyText(payment.payment_hash)" size="1em" color="grey" class="q-mb-xs cursor-pointer" />
-      </div>
-      </div>
-      <div class="row" v-if="payment.webhook">
-        <div class="col-3"><b v-text="$t('webhook')"></b>:</div>
-        <div class="col-9 text-wrap mono">
-          {{ payment.webhook }}
-          <q-badge :color="webhookStatusColor" text-color="white">
-            {{ webhookStatusText }}
-          </q-badge>
-        </div>
-      </div>
-      <div class="row" v-if="hasPreimage">
-        <div class="col-3"><b v-text="$t('payment_proof')"></b>:</div>
-        <div class="col-9 text-wrap mono">{{ payment.preimage }}</div>
-      </div>
-      <div class="row" v-for="entry in extras">
-        <div class="col-3">
-          <q-badge v-if="hasTag" color="secondary" text-color="white">
-            extra
-          </q-badge>
-          <b>{{ entry.key }}</b>:
-        </div>
-        <div class="col-9 text-wrap mono">{{ entry.value }}</div>
-      </div>
-      <div class="row" v-if="hasSuccessAction">
-        <div class="col-3"><b>Success action</b>:</div>
-        <div class="col-9">
-          <lnbits-lnurlpay-success-action
-            :payment="payment"
-            :success_action="payment.extra.success_action"
-          ></lnbits-lnurlpay-success-action>
-        </div>
-      </div>
-    </div>
+  <div class="q-py-md" style="text-align: left">
+      
+  <div v-if="payment.tag" class="row justify-center q-mb-md">
+    <q-badge v-if="hasTag" color="yellow" text-color="black">
+      #{{ payment.tag }}
+    </q-badge>
+  </div>
+  
+  <div class="row">
+    <b v-text="$t('created')"></b>:
+    {{ payment.date }} ({{ payment.dateFrom }})
+  </div>
+  
+  <div class="row">
+   <b v-text="$t('expiry')"></b>:
+   {{ payment.expirydate }} ({{ payment.expirydateFrom }})
+  </div>
+  
+  <div class="row">
+   <b v-text="$t('amount')"></b>:
+    {{ (payment.amount / 1000).toFixed(3) }} {{LNBITS_DENOMINATION}}
+  </div>
+  
+  <div class="row">
+    <b v-text="$t('fee')"></b>:
+    {{ (payment.fee / 1000).toFixed(3) }} {{LNBITS_DENOMINATION}}
+  </div>
+  
+  <div class="text-wrap">
+    <b style="white-space: nowrap;" v-text="$t('payment_hash')"></b>:&nbsp;{{ payment.payment_hash }}
+        <q-icon name="content_copy" @click="copyText(payment.payment_hash)" size="1em" color="grey" class="q-mb-xs cursor-pointer" />
+  </div>
+  
+  <div class="text-wrap">
+    <b style="white-space: nowrap;" v-text="$t('memo')"></b>:&nbsp;{{ payment.memo }}
+  </div>
+
+  <div class="row" v-if="payment.webhook">
+    <b v-text="$t('webhook')"></b>:
+    {{ payment.webhook }}
+    <q-badge :color="webhookStatusColor" text-color="white">
+      {{ webhookStatusText }}
+    </q-badge>
+  </div>
+
+  <div class="row" v-if="hasPreimage">
+    <b v-text="$t('payment_proof')"></b>:
+    {{ payment.preimage }}
+  </div>
+
+  <div class="row" v-for="entry in extras">
+    <q-badge v-if="hasTag" color="secondary" text-color="white">
+      extra
+    </q-badge>
+    <b>{{ entry.key }}</b>:
+    {{ entry.value }}
+  </div>
+
+  <div class="row" v-if="hasSuccessAction">
+    <b>Success action</b>:
+      <lnbits-lnurlpay-success-action
+        :payment="payment"
+        :success_action="payment.extra.success_action"
+      ></lnbits-lnurlpay-success-action>
+  </div>
+
+</div>
   `,
   computed: {
     hasPreimage() {

lnbits/static/vendor.json

@@ -25,6 +25,8 @@
     "/static/i18n/fr.js",
     "/static/i18n/nl.js",
     "/static/i18n/we.js",
+    "/static/i18n/pt.js",
+    "/static/i18n/br.js",
     "/static/js/base.js",
     "/static/js/components.js",
     "/static/js/bolt11-decoder.js"

lnbits/templates/base.html

@@ -78,55 +78,18 @@
             icon="language"
             class="q-pl-md"
           >
-            <q-list>
-              <q-item clickable v-close-popup @click="changeLanguage('en')">
-                <q-item-section>
-                  <q-item-label>EN</q-item-label>
-                </q-item-section>
-              </q-item>
-              <q-item clickable v-close-popup @click="changeLanguage('de')">
-                <q-item-section>
-                  <q-item-label>DE</q-item-label>
-                </q-item-section>
-              </q-item>
-              <q-item clickable v-close-popup @click="changeLanguage('es')">
-                <q-item-section>
-                  <q-item-label>ES</q-item-label>
-                </q-item-section>
-              </q-item>
-              <q-item clickable v-close-popup @click="changeLanguage('jp')">
-                <q-item-section>
-                  <q-item-label>JP</q-item-label>
-                </q-item-section>
-              </q-item>
-              <q-item clickable v-close-popup @click="changeLanguage('fr')">
-                <q-item-section>
-                  <q-item-label>FR</q-item-label>
-                </q-item-section>
-              </q-item>
-              <q-item clickable v-close-popup @click="changeLanguage('we')">
-                <q-item-section>
-                  <q-item-label>WE</q-item-label>
-                </q-item-section>
-              </q-item>
-              <q-item clickable v-close-popup @click="changeLanguage('it')">
-                <q-item-section>
-                  <q-item-label>IT</q-item-label>
-                </q-item-section>
-              </q-item>
-              <q-item clickable v-close-popup @click="changeLanguage('pi')">
-                <q-item-section>
-                  <q-item-label>PI</q-item-label>
-                </q-item-section>
-              </q-item>
-              <q-item clickable v-close-popup @click="changeLanguage('pl')">
-                <q-item-section>
-                  <q-item-label>PL</q-item-label>
-                </q-item-section>
-              </q-item>
-              <q-item clickable v-close-popup @click="changeLanguage('nl')">
-                <q-item-section>
-                  <q-item-label>NL</q-item-label>
+            <q-list v-for="(lang, index) in g.langs" :key="index">
+              <q-item
+                clickable
+                v-close-popup
+                @click="changeLanguage(lang.value)"
+                ><q-item-section>
+                  {% raw %}
+                  <q-item-label
+                    >{{lang.display ?? lang.value.toUpperCase()}}</q-item-label
+                  >
+                  <q-tooltip>{{lang.label}}</q-tooltip>
+                  {% endraw %}
                 </q-item-section>
               </q-item>
             </q-list>
@@ -275,6 +238,7 @@
         class="bg-transparent q-px-lg q-py-md"
         :class="{'text-dark': !$q.dark.isActive}"
       >
+        <q-space class="q-py-lg lt-sm"></q-space>
         <q-toolbar class="gt-sm">
           <q-toolbar-title class="text-caption">
             {{ SITE_TITLE }}, {{SITE_TAGLINE}}
@@ -328,11 +292,25 @@
     {% endfor %}
     <!---->
     <script type="text/javascript">
-      const themes = {{ LNBITS_THEME_OPTIONS  | tojson }}
-      const LNBITS_DENOMINATION = {{ LNBITS_DENOMINATION   | tojson}}
+      const themes = {{ LNBITS_THEME_OPTIONS | tojson }}
+      const LNBITS_DENOMINATION = {{ LNBITS_DENOMINATION | tojson }}
       if (themes && themes.length) {
         window.allowedThemes = themes.map(str => str.trim())
       }
+      window.langs = [
+        {value: 'en', label: 'English', display: 'EN'},
+        {value: 'de', label: 'Deutsch', display: 'DE'},
+        {value: 'es', label: 'Español', display: 'ES'},
+        {value: 'jp', label: '日本語', display: 'JP'},
+        {value: 'fr', label: 'Français', display: 'FR'},
+        {value: 'it', label: 'Italiano', display: 'IT'},
+        {value: 'pi', label: 'Pirate', display: 'PI'},
+        {value: 'nl', label: 'Nederlands', display: 'NL'},
+        {value: 'we', label: 'Cymraeg', display: 'CY'},
+        {value: 'pl', label: 'Polski', display: 'PL'},
+        {value: 'pt', label: 'Português', display: 'PT'},
+        {value: 'br', label: 'Português', display: 'BR'}
+      ]
     </script>
     {% block scripts %}{% endblock %}
   </body>

lnbits/wallets/cln.py

@@ -69,7 +69,7 @@ class CoreLightningWallet(Wallet):
         try:
             funds = self.ln.listfunds()
             return StatusResponse(
-                None, sum([ch["channel_sat"] * 1000 for ch in funds["channels"]])
+                None, sum([int(ch["our_amount_msat"]) for ch in funds["channels"]])
             )
         except RpcError as exc:
             error_message = f"lightningd '{exc.method}' failed with '{exc.error}'."
@@ -141,7 +141,7 @@ class CoreLightningWallet(Wallet):
         except Exception as exc:
             return PaymentResponse(False, None, None, None, str(exc))
 
-        fee_msat = -int(r["msatoshi_sent"] - r["msatoshi"])
+        fee_msat = -int(r["amount_sent_msat"] - r["amount_msat"])
         return PaymentResponse(
             True, r["payment_hash"], fee_msat, r["payment_preimage"], None
         )

package.json

@@ -72,6 +72,8 @@
       "/static/i18n/fr.js",
       "/static/i18n/nl.js",
       "/static/i18n/we.js",
+      "/static/i18n/pt.js",
+      "/static/i18n/br.js",
       "/static/js/base.js",
       "/static/js/components.js",
       "/static/js/bolt11-decoder.js"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "lnbits"
-version = "0.10.7"
+version = "0.10.8"
 description = "LNbits, free and open-source Lightning wallet and accounts system."
 authors = ["Alan Bits <alan@lnbits.com>"]