From b1da10308085b135acb25302bfd4e3b94d87fe32 Mon Sep 17 00:00:00 2001 From: Eneko Illarramendi Date: Tue, 21 Apr 2020 23:47:16 +0200 Subject: [PATCH] chore: minor tweaks --- .env.example | 2 +- .gitattributes | 1 + lnbits/core/static/js/wallet.js | 2 +- lnbits/core/views/api.py | 2 +- lnbits/static/js/base.js | 6 +++--- 5 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 .gitattributes diff --git a/.env.example b/.env.example index 5669286b..840f75b2 100644 --- a/.env.example +++ b/.env.example @@ -11,7 +11,7 @@ LNBITS_WITH_ONION=0 # Choose from LNPayWallet, OpenNodeWallet, LntxbotWallet, LndWallet, CLightningWallet, LnbitsWallet LNBITS_BACKEND_WALLET_CLASS=LntxbotWallet -CLIGHTNING_RPC="/home/arc/.lightning/bitcoin/lightning-rpc" +CLIGHTNING_RPC="/home/bob/.lightning/bitcoin/lightning-rpc" LNBITS_ENDPOINT=127.0.0.1:5000 LNBITS_INVOICE_MACAROON=LNBITS_INVOICE_MACAROON diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..3f195adf --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +/**/static/vendor/ linguist-vendored diff --git a/lnbits/core/static/js/wallet.js b/lnbits/core/static/js/wallet.js index 45e3ec62..1684e7a3 100644 --- a/lnbits/core/static/js/wallet.js +++ b/lnbits/core/static/js/wallet.js @@ -347,6 +347,6 @@ new Vue({ if (!this.$q.localStorage.getItem('lnbits.disclaimerShown')) { this.disclaimerDialog.show = true; this.$q.localStorage.set('lnbits.disclaimerShown', true); - }; + } } }); diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py index aa778cb5..876d54a8 100644 --- a/lnbits/core/views/api.py +++ b/lnbits/core/views/api.py @@ -17,7 +17,7 @@ def api_payments(): for payment in g.wallet.get_payments(include_all_pending=True): if payment.is_out: payment.set_pending(WALLET.get_payment_status(payment.checking_id).pending) - elif payment.is_in: + else: payment.set_pending(WALLET.get_invoice_status(payment.checking_id).pending) return jsonify(g.wallet.get_payments()), Status.OK diff --git a/lnbits/static/js/base.js b/lnbits/static/js/base.js index 6c253c59..3e49caa6 100644 --- a/lnbits/static/js/base.js +++ b/lnbits/static/js/base.js @@ -102,13 +102,13 @@ var LNbits = { Quasar.plugins.Notify.create({ timeout: 5000, type: types[error.response.status] || 'warning', - message: error.response.data.message || null, - caption: [error.response.status, ' ', error.response.statusText].join('').toUpperCase() || null, + message: error.response.data.message || null, + caption: [error.response.status, ' ', error.response.statusText].join('').toUpperCase() || null, icon: null }); }, search: function (data, q, field, separator) { - var field = field || '_q'; + var field = field || '_q'; try { var queries = q.toLowerCase().split(separator || ' ');