fix: refresh payments on payment success (#2502)

* fix: refresh payments on payment

lnbits/core/templates/core/wallet.html

@@ -105,7 +105,7 @@
         <payment-list
           :update="updatePayments"
           :wallet="this.g.wallet"
-          :mobileSimple="mobileSimple"
+          :mobile-simple="mobileSimple"
         />
       </div>
       {% if HIDE_API %}

lnbits/static/js/admin.js

@@ -77,6 +77,30 @@ new Vue({
     }
   },
   methods: {
+    addAdminUser() {
+      let addUser = this.formAddAdmin
+      let admin_users = this.formData.lnbits_admin_users
+      if (addUser && addUser.length && !admin_users.includes(addUser)) {
+        this.formData.lnbits_admin_users = [...admin_users, addUser]
+        this.formAddAdmin = ''
+      }
+    },
+    removeAdminUser(user) {
+      let admin_users = this.formData.lnbits_admin_users
+      this.formData.lnbits_admin_users = admin_users.filter(u => u !== user)
+    },
+    addAllowedUser() {
+      let addUser = this.formAddUser
+      let allowed_users = this.formData.lnbits_allowed_users
+      if (addUser && addUser.length && !allowed_users.includes(addUser)) {
+        this.formData.lnbits_allowed_users = [...allowed_users, addUser]
+        this.formAddUser = ''
+      }
+    },
+    removeAllowedUser(user) {
+      let allowed_users = this.formData.lnbits_allowed_users
+      this.formData.lnbits_allowed_users = allowed_users.filter(u => u !== user)
+    },
     addExtensionsManifest() {
       const addManifest = this.formAddExtensionsManifest.trim()
       const manifests = this.formData.lnbits_extensions_manifests

lnbits/static/js/components/payment-chart.js

@@ -83,6 +83,7 @@ function generateChart(canvas, rawData) {
 Vue.component('payment-chart', {
   name: 'payment-chart',
   props: ['wallet'],
+  mixins: [windowMixin],
   data: function () {
     return {
       paymentsChart: {

lnbits/static/js/components/payment-list.js

@@ -1,6 +1,7 @@
 Vue.component('payment-list', {
   name: 'payment-list',
   props: ['update', 'wallet', 'mobileSimple', 'lazy'],
+  mixins: [windowMixin],
   data: function () {
     return {
       denomination: LNBITS_DENOMINATION,
@@ -164,11 +165,11 @@ Vue.component('payment-list', {
         )
       })
     },
-    formatCurrency: function (currency, amount) {
+    formatCurrency: function (amount, currency) {
       try {
-        return LNbits.utils.formatCurrency(currency, amount)
+        return LNbits.utils.formatCurrency(amount, currency)
-      } catch (error) {
+      } catch (e) {
-        console.warn(error)
+        console.error(e)
         return `${amount} ???`
       }
     }
@@ -295,22 +296,22 @@ Vue.component('payment-list', {
                 key="amount"
                 v-if="denomination != 'sats'"
                 :props="props"
-                class="lol1"
+                class="col1"
                 v-text="parseFloat(String(props.row.fsat).replaceAll(',', '')) / 100"
               >
               </q-td>
-              <q-td class="lol2" auto-width key="amount" v-else :props="props">
+              <q-td class="col2" auto-width key="amount" v-else :props="props">
                 <span v-text="props.row.fsat"></span>
                 <br />
                 <i v-if="props.row.extra.wallet_fiat_currency">
                   <span
-                    v-text="formatCurrency(props.row.extra.wallet_fiat_currency, props.row.extra.wallet_fiat_amount)"
+                    v-text="formatCurrency(props.row.extra.wallet_fiat_amount, props.row.extra.wallet_fiat_currency)"
                   ></span>
                   <br />
                 </i>
                 <i v-if="props.row.extra.fiat_currency">
                   <span
-                    v-text="formatCurrency(props.row.extra.fiat_currency, props.row.extra.fiat_amount)"
+                    v-text="formatCurrency(props.row.extra.fiat_amount, props.row.extra.fiat_currency)"
                   ></span>
                 </i>
               </q-td>

lnbits/static/js/wallet.js

@@ -49,7 +49,7 @@ new Vue({
         show: false,
         location: window.location
       },
-      balance: 0,
+      balance: parseInt(wallet.balance_msat / 1000),
       fiatBalance: 0,
       mobileSimple: false,
       credit: 0,
@@ -349,9 +349,10 @@ new Vue({
               .getPayment(this.g.wallet, response.data.payment_hash)
               .then(res => {
                 if (res.data.paid) {
-                  this.parse.show = false
-                  clearInterval(this.parse.paymentChecker)
                   dismissPaymentMsg()
+                  clearInterval(this.parse.paymentChecker)
+                  this.updatePayments = !this.updatePayments
+                  this.parse.show = false
                 }
               })
           }, 2000)
@@ -359,6 +360,8 @@ new Vue({
         .catch(err => {
           dismissPaymentMsg()
           LNbits.utils.notifyApiError(err)
+          this.updatePayments = !this.updatePayments
+          this.parse.show = false
         })
     },
     payLnurl: function () {