feat: improve VoidWallet warning visibility on all devices (#3428)

This commit is contained in:
Ben Weeks 2025-10-27 08:12:37 +00:00 committed by GitHub
parent 87f25ea715
commit f794373d30
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 9 deletions

File diff suppressed because one or more lines are too long

View file

@ -72,6 +72,10 @@ window.localisation.en = {
donate: 'Donate', donate: 'Donate',
view_github: 'View on GitHub', view_github: 'View on GitHub',
voidwallet_active: 'VoidWallet is active! Payments disabled', voidwallet_active: 'VoidWallet is active! Payments disabled',
voidwallet_active_user:
'Funding source unavailable. Please contact your admin to configure.',
voidwallet_active_admin:
'Funding source unavailable. Click here to configure.',
service_fee_badge: 'Service fee: {amount} % per transaction', service_fee_badge: 'Service fee: {amount} % per transaction',
service_fee_max_badge: service_fee_max_badge:
'Service fee: {amount} % per transaction (max {max} {denom})', 'Service fee: {amount} % per transaction (max {max} {denom})',

View file

@ -92,6 +92,22 @@
<div id="vue"> <div id="vue">
<q-layout view="hHh lpR lfr" v-cloak> <q-layout view="hHh lpR lfr" v-cloak>
<q-header bordered class="bg-marginal-bg"> <q-header bordered class="bg-marginal-bg">
<!-- VoidWallet Warning Banner -->
{% if VOIDWALLET %}
<q-banner v-if="g.user" class="bg-warning text-white" dense>
<template v-slot:avatar>
<q-icon name="warning" color="white" />
</template>
<a
v-if="g.user && (g.user.super_user || g.user.admin)"
href="/admin"
style="color: white; text-decoration: underline; cursor: pointer"
v-text="$t('voidwallet_active_admin')"
></a>
<span v-else v-text="$t('voidwallet_active_user')"></span>
</q-banner>
{% endif %}
<q-toolbar> <q-toolbar>
{% block drawer_toggle %} {% block drawer_toggle %}
<q-btn <q-btn
@ -115,14 +131,7 @@
<q-badge v-else-if="g.user && g.user.admin">Admin User</q-badge> <q-badge v-else-if="g.user && g.user.admin">Admin User</q-badge>
{% endblock %} {% endblock %}
</q-toolbar-title> </q-toolbar-title>
{% block beta %} {% if VOIDWALLET %} {% block beta %} {% if LNBITS_CUSTOM_BADGE is not none and
<q-badge
v-text="$t('voidwallet_active')"
color="red"
class="q-mr-md gt-md"
>
</q-badge>
{%endif%} {% if LNBITS_CUSTOM_BADGE is not none and
LNBITS_CUSTOM_BADGE != "" %} LNBITS_CUSTOM_BADGE != "" %}
<q-badge <q-badge
v-show="$q.screen.gt.sm" v-show="$q.screen.gt.sm"