From 3dd1c6992b69d402a14f9b01392829b2d7945f52 Mon Sep 17 00:00:00 2001
From: arcbtc <ben@arc.wales>
Date: Wed, 18 Dec 2024 20:40:32 +0000
Subject: [PATCH 01/17] Trigger to default fiat conversion on

Like all the other wallets
---
 lnbits/core/migrations.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/lnbits/core/migrations.py b/lnbits/core/migrations.py
index 2d4f059c8..347f45d36 100644
--- a/lnbits/core/migrations.py
+++ b/lnbits/core/migrations.py
@@ -684,3 +684,22 @@ async def m029_create_audit_table(db: Connection):
         );
         """
     )
+    
+async def m030_add_currency_to_wallet(db: Connection):
+    """
+    Setting currency to default is heavy, so easier just to add a trigger.
+    """
+    await db.execute(
+
+        """
+        CREATE TRIGGER IF NOT EXISTS set_default_currency
+        AFTER INSERT ON wallets
+        FOR EACH ROW
+        WHEN NEW.currency IS NULL
+        BEGIN
+            UPDATE wallets
+            SET currency = 'USD'
+            WHERE id = NEW.id;
+        END;
+        """
+    )
\ No newline at end of file

From ce9b63c54ebf0fc9a6a428a80e14694ef7553401 Mon Sep 17 00:00:00 2001
From: arcbtc <ben@arc.wales>
Date: Wed, 18 Dec 2024 20:53:55 +0000
Subject: [PATCH 02/17] step1 wallet card adjust

---
 lnbits/core/templates/core/wallet.html | 127 +++++++++++++++++++++----
 1 file changed, 106 insertions(+), 21 deletions(-)

diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html
index 58ff78e43..4c6363bf2 100644
--- a/lnbits/core/templates/core/wallet.html
+++ b/lnbits/core/templates/core/wallet.html
@@ -34,31 +34,111 @@
         } : ''"
         >
           <q-card-section>
-            <h3 class="q-my-none text-no-wrap">
-              <strong v-text="formattedBalance"></strong>
-              <small> {{LNBITS_DENOMINATION}}</small>
-              <lnbits-update-balance
-                :wallet_id="this.g.wallet.id"
-                @credit-value="handleBalanceUpdate"
-                class="q-ml-md"
-              ></lnbits-update-balance>
-            </h3>
             <div class="row">
-              <div class="col">
-                <div v-if="g.wallet.currency">
+              <div class="col-1" style="max-width: 30px">
+                <q-btn
+                  v-if="g.wallet.currency"
+                  @click="swapBalancePriority"
+                  style="height: 50px"
+                  class="q-mt-lg"
+                  flat
+                  dense
+                  icon="swap_vert"
+                ></q-btn>
+              </div>
+              <div class="col-11">
+                <div
+                  class="column"
+                  v-if="!isPrioritySwapped"
+                  style="height: 100px"
+                >
+                  <div class="col-7">
+                    <div class="row">
+                      <div class="col-auto">
+                        <div class="text-h3 q-my-none text-no-wrap">
+                          <strong v-text="formattedBalance"></strong>
+                          <small> {{LNBITS_DENOMINATION}}</small>
+                        </div>
+                      </div>
+                      <div class="col-auto">
+                        <lnbits-update-balance
+                          v-if="$q.screen.lt.lg"
+                          :wallet_id="this.g.wallet.id"
+                          :callback="updateBalanceCallback"
+                          :small_btn="true"
+                        ></lnbits-update-balance>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="col-2">
+                    <div v-if="g.wallet.currency && fiatTracking">
+                      <span
+                        class="text-h5 text-italic"
+                        v-text="formattedFiatAmount"
+                        style="opacity: 0.75"
+                      ></span>
+                    </div>
+                  </div>
+                </div>
+
+                <div
+                  class="column"
+                  v-if="isPrioritySwapped && fiatTracking"
+                  style="height: 100px"
+                >
+                  <div class="col-7">
+                    <div class="row">
+                      <div class="col-auto">
+                        <div
+                          v-if="g.wallet.currency"
+                          class="text-h3 q-my-none text-no-wrap"
+                        >
+                          <strong
+                            v-text="formattedFiatAmount"
+                          ></strong>
+                        </div>
+                      </div>
+                      <div class="col-auto">
+                        <lnbits-update-balance
+                          v-if="$q.screen.lt.lg"
+                          :wallet_id="this.g.wallet.id"
+                          :callback="updateBalanceCallback"
+                          :small_btn="true"
+                        ></lnbits-update-balance>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="col-2">
+                    <span
+                      class="text-h5 text-italic"
+                      style="opacity: 0.75"
+                      v-text="formattedBalance + ' {{LNBITS_DENOMINATION}}'"
+                    >
+                    </span>
+                  </div>
+                </div>
+
+                <div class="absolute-right q-pa-md" v-if="$q.screen.gt.md && g.wallet.currency && fiatTracking">
+                  <div class="text-bold text-italic">
+                    BTC Price
+                    <span
+                      :class="{'text-positive q-pl-xs': priceChange > 0, 'text-negative q-pl-xs': priceChange < 0}"
+                      v-text="priceChange"
+                    ></span>
+                  </div>
                   <span
-                    class="text-h5 text-italic"
-                    v-text="formattedFiatBalance"
-                    style="opacity: 0.75"
+                    class="text-bold text-italic"
+                    v-text="formattedExchange"
                   ></span>
                 </div>
-              </div>
-              <div class="col">
                 <q-btn
+                  v-if="$q.screen.lt.md"
                   @click="mobileSimple = !mobileSimple"
                   color="primary"
-                  class="float-right lt-md"
+                  class="q-ml-xl absolute-right"
+                  dense
                   size="sm"
+                  style="height: 20px; margin-top: 75px"
                   flat
                   :icon="mobileSimple ? 'unfold_more' : 'unfold_less'"
                   :label="mobileSimple ? $t('more') : $t('less')"
@@ -71,7 +151,7 @@
               <q-btn
                 unelevated
                 color="primary"
-                class="full-width"
+                class="q-mr-md"
                 @click="showParseDialog"
                 :label="$t('paste_request')"
               ></q-btn>
@@ -80,7 +160,7 @@
               <q-btn
                 unelevated
                 color="primary"
-                class="full-width"
+                class="q-mr-md"
                 @click="showReceiveDialog"
                 :label="$t('create_invoice')"
               ></q-btn>
@@ -89,14 +169,19 @@
               <q-btn
                 unelevated
                 color="secondary"
-                icon="photo_camera"
-                @click="showCamera"
+                icon="qr_code_scanner"
                 :label="$t('scan')"
               >
                 <q-tooltip
                   ><span v-text="$t('camera_tooltip')"></span
                 ></q-tooltip>
               </q-btn>
+              <lnbits-update-balance
+              v-if="$q.screen.gt.md"
+              :wallet_id="this.g.wallet.id"
+              :callback="updateBalanceCallback"
+              :small_btn="false"
+            ></lnbits-update-balance>
             </div>
           </div>
         </q-card>

From f74a7cbe1f675409887ded34451eb26a476b0ea9 Mon Sep 17 00:00:00 2001
From: arcbtc <ben@arc.wales>
Date: Wed, 18 Dec 2024 20:56:28 +0000
Subject: [PATCH 03/17] step2

---
 lnbits/core/templates/core/wallet.html | 37 ++++++++++++++------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html
index 4c6363bf2..33fd4f6bf 100644
--- a/lnbits/core/templates/core/wallet.html
+++ b/lnbits/core/templates/core/wallet.html
@@ -300,24 +300,27 @@
                   <q-card>
                     <q-card-section>
                       <div style="max-width: 360px">
-                        <q-select
-                          filled
-                          dense
-                          clearable
-                          v-model="update.currency"
-                          type="text"
-                          :label="$t('currency')"
-                          :options="receive.units.filter((u) => u !== 'sat')"
-                        ></q-select>
+                        <div class="row">
+                          <div class="col-auto">
+                            <q-toggle
+                              v-model="fiatTracking"
+                              color="primary"
+                              @update:model-value="handleFiatTracking"
+                      ></q-toggle>
+                          </div>
+                          <div class="col">
+                            <q-select
+                            filled
+                            dense
+                            v-model="update.currency"
+                            type="text"
+                            :label="!fiatTracking ? 'Disabled' : $t('currency')"
+                            :options="receive.units.filter((u) => u !== 'sat')"
+                            :disable="!fiatTracking"
+                          ></q-select>
+                          </div>
+                        </div>
                       </div>
-                      <q-btn
-                        :disable="!update.name.length"
-                        unelevated
-                        class="q-mt-sm"
-                        color="primary"
-                        :label="$t('update_currency')"
-                        @click="updateWallet({ currency: update.currency || '' })"
-                      ></q-btn>
                     </q-card-section>
                   </q-card>
                 </q-expansion-item>

From 468a786f784c08dcd026ce8874a222071471f388 Mon Sep 17 00:00:00 2001
From: arcbtc <ben@arc.wales>
Date: Wed, 18 Dec 2024 21:00:41 +0000
Subject: [PATCH 04/17] step3

---
 lnbits/core/templates/core/wallet.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html
index 33fd4f6bf..6e6b50462 100644
--- a/lnbits/core/templates/core/wallet.html
+++ b/lnbits/core/templates/core/wallet.html
@@ -185,6 +185,7 @@
             </div>
           </div>
         </q-card>
+       
         <q-card
           :style="
           $q.screen.lt.md
@@ -201,17 +202,14 @@
               :update="updatePayments"
               :wallet="this.g.wallet"
               :mobile-simple="mobileSimple"
-            />
+            ></payment-list>
           </q-card-section>
         </q-card>
       </div>
       {% if HIDE_API %}
       <div class="col-12 col-md-4 q-gutter-y-md">
         {% else %}
-        <div
-          v-if="!mobileSimple || $q.screen.gt.sm"
-          class="col-12 col-md-5 q-gutter-y-md"
-        >
+        <div v-if="!mobileSimple" class="col-12 col-md-5 q-gutter-y-md">
           <q-card>
             <q-card-section>
               <h6 class="text-subtitle1 q-mt-none q-mb-sm">

From 7fc723c2ddc804236a292514acb97fe823966476 Mon Sep 17 00:00:00 2001
From: arcbtc <ben@arc.wales>
Date: Wed, 18 Dec 2024 21:33:02 +0000
Subject: [PATCH 05/17] added js

---
 lnbits/static/js/wallet.js | 77 +++++++++++++++++++++++++++++++-------
 1 file changed, 63 insertions(+), 14 deletions(-)

diff --git a/lnbits/static/js/wallet.js b/lnbits/static/js/wallet.js
index aa0fffeab..cfa75d621 100644
--- a/lnbits/static/js/wallet.js
+++ b/lnbits/static/js/wallet.js
@@ -58,7 +58,11 @@ window.app = Vue.createApp({
       inkeyHidden: true,
       adminkeyHidden: true,
       hasNfc: false,
-      nfcReaderAbortController: null
+      nfcReaderAbortController: null,
+      isPrioritySwapped: false,
+      fiatTracking: false,
+      formattedFiatAmount: 0,
+      exchangeRate: 0
     }
   },
   computed: {
@@ -69,10 +73,10 @@ window.app = Vue.createApp({
         return LNbits.utils.formatSat(this.balance || this.g.wallet.sat)
       }
     },
-    formattedFiatBalance() {
-      if (this.fiatBalance) {
+    formattedExchange() {
+      if (this.fiatTracking) {
         return LNbits.utils.formatCurrency(
-          this.fiatBalance.toFixed(2),
+          this.exchangeRate,
           this.g.wallet.currency
         )
       }
@@ -96,6 +100,12 @@ window.app = Vue.createApp({
     }
   },
   methods: {
+    formatFiatAmount(amount, currency) {
+      this.formattedFiatAmount = LNbits.utils.formatCurrency(
+        amount.toFixed(2),
+        currency
+      )
+    },
     msatoshiFormat(value) {
       return LNbits.utils.formatSat(value / 1000)
     },
@@ -538,15 +548,20 @@ window.app = Vue.createApp({
             })
         })
     },
-    updateFiatBalance() {
-      if (!this.g.wallet.currency) return 0
+    updateFiatBalance(currency) {
+      this.exchangeRate = this.$q.localStorage.getItem('lnbits.exchangeRate')
+      this.fiatBalance =
+        (this.exchangeRate / 100000000) * (this.g.wallet.sat)
       LNbits.api
-        .request('POST', `/api/v1/conversion`, null, {
-          amount: this.balance || this.g.wallet.sat,
-          to: this.g.wallet.currency
-        })
+      .request('GET', `/api/v1/rate/` + currency, null)
         .then(response => {
-          this.fiatBalance = response.data[this.g.wallet.currency]
+          this.fiatBalance =
+          (response.data.rate / 100000000) *
+          (this.g.wallet.sat)
+        this.exchangeRate = response.data.rate.toFixed(2)
+        this.fiatTracking = true
+        this.formatFiatAmount(this.fiatBalance, currency)
+        this.$q.localStorage.set('lnbits.exchangeRate', this.exchangeRate)
         })
         .catch(e => console.error(e))
     },
@@ -651,6 +666,23 @@ window.app = Vue.createApp({
           dismissPaymentMsg()
           LNbits.utils.notifyApiError(err)
         })
+    },
+    swapBalancePriority() {
+      this.isPrioritySwapped = !this.isPrioritySwapped
+      this.$q.localStorage.setItem(
+        'lnbits.isPrioritySwapped',
+        this.isPrioritySwapped
+      )
+    },
+    handleFiatTracking() {
+      if (this.fiatTracking === false) {
+        this.updateWallet({ currency: ''})
+        this.$q.localStorage.setItem(
+          'lnbits.isPrioritySwapped',
+          false
+        )
+        this.$q.localStorage.remove(`lnbits.exchangeRate`)
+      }
     }
   },
   created() {
@@ -664,15 +696,26 @@ window.app = Vue.createApp({
     if (this.$q.screen.lt.md) {
       this.mobileSimple = true
     }
+    if(this.g.wallet.currency){
+      this.updateFiatBalance(this.g.wallet.currency)
+      this.getPriceChange()
+    }
     this.update.name = this.g.wallet.name
-    this.update.currency = this.g.wallet.currency
     this.receive.units = ['sat', ...window.currencies]
-    this.updateFiatBalance()
   },
   watch: {
+    '$q.screen.gt.sm'(value) {
+      if (value == true) {
+        this.mobileSimple = false
+      }
+    },
     updatePayments() {
       this.updateFiatBalance()
-    }
+    },
+    'update.currency'(newValue) {
+      this.updateWallet({ currency: newValue })
+      this.updateFiatBalance(newValue)
+      this.getPriceChange()
   },
   mounted() {
     // show disclaimer
@@ -680,6 +723,12 @@ window.app = Vue.createApp({
       this.disclaimerDialog.show = true
       this.$q.localStorage.set('lnbits.disclaimerShown', true)
     }
+    // check blanace priority
+    if (this.$q.localStorage.getItem('lnbits.isPrioritySwapped')) {
+      this.isPrioritySwapped = this.$q.localStorage.getItem(
+        'lnbits.isPrioritySwapped'
+      )
+    }
     // listen to incoming payments
     LNbits.events.onInvoicePaid(this.g.wallet, data => {
       console.log('Payment received:', data.payment.payment_hash)

From 1a6671b4b337fb0e807892cdfa4f5277d1e0aaf6 Mon Sep 17 00:00:00 2001
From: arcbtc <ben@arc.wales>
Date: Wed, 18 Dec 2024 21:38:48 +0000
Subject: [PATCH 06/17] bug

---
 lnbits/static/js/wallet.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lnbits/static/js/wallet.js b/lnbits/static/js/wallet.js
index cfa75d621..300a08717 100644
--- a/lnbits/static/js/wallet.js
+++ b/lnbits/static/js/wallet.js
@@ -524,7 +524,6 @@ window.app = Vue.createApp({
             type: 'positive',
             timeout: 3500
           })
-          window.location.reload()
         })
         .catch(err => {
           LNbits.utils.notifyApiError(err)
@@ -698,7 +697,6 @@ window.app = Vue.createApp({
     }
     if(this.g.wallet.currency){
       this.updateFiatBalance(this.g.wallet.currency)
-      this.getPriceChange()
     }
     this.update.name = this.g.wallet.name
     this.receive.units = ['sat', ...window.currencies]
@@ -710,12 +708,12 @@ window.app = Vue.createApp({
       }
     },
     updatePayments() {
-      this.updateFiatBalance()
+      this.updateFiatBalance(this.g.wallet.currenc)
     },
     'update.currency'(newValue) {
       this.updateWallet({ currency: newValue })
       this.updateFiatBalance(newValue)
-      this.getPriceChange()
+    }
   },
   mounted() {
     // show disclaimer

From acd3b598b7dd6ae264925a89db654546028d9b20 Mon Sep 17 00:00:00 2001
From: arcbtc <ben@arc.wales>
Date: Wed, 18 Dec 2024 21:55:54 +0000
Subject: [PATCH 07/17] bug fix

---
 lnbits/core/templates/core/wallet.html | 8 +++-----
 lnbits/static/js/wallet.js             | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html
index 6e6b50462..2d21f2f90 100644
--- a/lnbits/core/templates/core/wallet.html
+++ b/lnbits/core/templates/core/wallet.html
@@ -28,10 +28,9 @@
         <q-card
           :style="$q.screen.lt.md ? {
             background: $q.screen.lt.md ? 'none !important': ''
-          , boxShadow: $q.screen.lt.md ? 'none !important': ''
-          , margin: $q.screen.lt.md && mobileSimple ? 'auto !important': ''
-          , width: $q.screen.lt.md && mobileSimple ? '90% !important': ''
-        } : ''"
+            , boxShadow: $q.screen.lt.md ? 'none !important': ''
+            , width: $q.screen.lt.md && mobileSimple ? '90% !important': ''
+          } : ''"
         >
           <q-card-section>
             <div class="row">
@@ -170,7 +169,6 @@
                 unelevated
                 color="secondary"
                 icon="qr_code_scanner"
-                :label="$t('scan')"
               >
                 <q-tooltip
                   ><span v-text="$t('camera_tooltip')"></span
diff --git a/lnbits/static/js/wallet.js b/lnbits/static/js/wallet.js
index 300a08717..4b778a398 100644
--- a/lnbits/static/js/wallet.js
+++ b/lnbits/static/js/wallet.js
@@ -708,7 +708,7 @@ window.app = Vue.createApp({
       }
     },
     updatePayments() {
-      this.updateFiatBalance(this.g.wallet.currenc)
+      this.fetchBalance()
     },
     'update.currency'(newValue) {
       this.updateWallet({ currency: newValue })

From e13fd39e75748c3cc574b853b1b5fecd89dfb983 Mon Sep 17 00:00:00 2001
From: arcbtc <ben@arc.wales>
Date: Wed, 18 Dec 2024 22:15:17 +0000
Subject: [PATCH 08/17] layout bug

---
 lnbits/core/templates/core/wallet.html | 15 +++------------
 lnbits/static/js/wallet.js             |  9 +++++----
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html
index 2d21f2f90..4411661f8 100644
--- a/lnbits/core/templates/core/wallet.html
+++ b/lnbits/core/templates/core/wallet.html
@@ -51,7 +51,7 @@
                   v-if="!isPrioritySwapped"
                   style="height: 100px"
                 >
-                  <div class="col-7">
+                  <div class="col-7" :class="{'q-pt-lg': !g.wallet.currency && !fiatTracking}">
                     <div class="row">
                       <div class="col-auto">
                         <div class="text-h3 q-my-none text-no-wrap">
@@ -120,10 +120,6 @@
                 <div class="absolute-right q-pa-md" v-if="$q.screen.gt.md && g.wallet.currency && fiatTracking">
                   <div class="text-bold text-italic">
                     BTC Price
-                    <span
-                      :class="{'text-positive q-pl-xs': priceChange > 0, 'text-negative q-pl-xs': priceChange < 0}"
-                      v-text="priceChange"
-                    ></span>
                   </div>
                   <span
                     class="text-bold text-italic"
@@ -146,7 +142,7 @@
             </div>
           </q-card-section>
           <div class="row q-pb-md q-px-md q-col-gutter-md gt-sm">
-            <div class="col">
+
               <q-btn
                 unelevated
                 color="primary"
@@ -154,8 +150,6 @@
                 @click="showParseDialog"
                 :label="$t('paste_request')"
               ></q-btn>
-            </div>
-            <div class="col">
               <q-btn
                 unelevated
                 color="primary"
@@ -163,8 +157,6 @@
                 @click="showReceiveDialog"
                 :label="$t('create_invoice')"
               ></q-btn>
-            </div>
-            <div class="col">
               <q-btn
                 unelevated
                 color="secondary"
@@ -180,8 +172,7 @@
               :callback="updateBalanceCallback"
               :small_btn="false"
             ></lnbits-update-balance>
-            </div>
-          </div>
+</div>
         </q-card>
        
         <q-card
diff --git a/lnbits/static/js/wallet.js b/lnbits/static/js/wallet.js
index 4b778a398..78f86aaac 100644
--- a/lnbits/static/js/wallet.js
+++ b/lnbits/static/js/wallet.js
@@ -722,10 +722,11 @@ window.app = Vue.createApp({
       this.$q.localStorage.set('lnbits.disclaimerShown', true)
     }
     // check blanace priority
-    if (this.$q.localStorage.getItem('lnbits.isPrioritySwapped')) {
-      this.isPrioritySwapped = this.$q.localStorage.getItem(
-        'lnbits.isPrioritySwapped'
-      )
+    if (this.$q.localStorage.getItem('lnbits.isPrioritySwapped')){
+      this.isPrioritySwapped = this.$q.localStorage.getItem('lnbits.isPrioritySwapped')
+    } else {
+      this.isPrioritySwapped = false
+      this.$q.localStorage.setItem('lnbits.isPrioritySwapped', false)
     }
     // listen to incoming payments
     LNbits.events.onInvoicePaid(this.g.wallet, data => {

From fb5659de2a23239bd38f43bdd6275a47fbe1c3e5 Mon Sep 17 00:00:00 2001
From: arcbtc <ben@arc.wales>
Date: Wed, 18 Dec 2024 23:19:03 +0000
Subject: [PATCH 09/17] working, also fixed the button

---
 lnbits/core/templates/core/wallet.html | 25 ++++++++++++------
 lnbits/static/js/components.js         |  2 +-
 lnbits/static/js/wallet.js             | 35 +++++++++++++++-----------
 lnbits/templates/components.vue        | 26 ++++++++++++++++++-
 4 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html
index 4411661f8..e707b1a4c 100644
--- a/lnbits/core/templates/core/wallet.html
+++ b/lnbits/core/templates/core/wallet.html
@@ -36,7 +36,7 @@
             <div class="row">
               <div class="col-1" style="max-width: 30px">
                 <q-btn
-                  v-if="g.wallet.currency"
+                  v-if="update.currency"
                   @click="swapBalancePriority"
                   style="height: 50px"
                   class="q-mt-lg"
@@ -48,10 +48,14 @@
               <div class="col-11">
                 <div
                   class="column"
+                  :class="{
+                    'q-pt-sm': update.currency,
+                    'q-pt-lg': !update.currency
+                  }"
                   v-if="!isPrioritySwapped"
-                  style="height: 100px"
+                  style="height: 90px"
                 >
-                  <div class="col-7" :class="{'q-pt-lg': !g.wallet.currency && !fiatTracking}">
+                  <div class="col-7" >
                     <div class="row">
                       <div class="col-auto">
                         <div class="text-h3 q-my-none text-no-wrap">
@@ -70,7 +74,7 @@
                     </div>
                   </div>
                   <div class="col-2">
-                    <div v-if="g.wallet.currency && fiatTracking">
+                    <div v-if="update.currency">
                       <span
                         class="text-h5 text-italic"
                         v-text="formattedFiatAmount"
@@ -82,14 +86,18 @@
 
                 <div
                   class="column"
-                  v-if="isPrioritySwapped && fiatTracking"
+                  v-if="isPrioritySwapped"
+                  :class="{
+                    'q-pt-sm': update.currency,
+                    'q-pt-lg': !update.currency
+                  }"
                   style="height: 100px"
                 >
                   <div class="col-7">
                     <div class="row">
                       <div class="col-auto">
                         <div
-                          v-if="g.wallet.currency"
+                          v-if="update.currency"
                           class="text-h3 q-my-none text-no-wrap"
                         >
                           <strong
@@ -117,7 +125,7 @@
                   </div>
                 </div>
 
-                <div class="absolute-right q-pa-md" v-if="$q.screen.gt.md && g.wallet.currency && fiatTracking">
+                <div class="absolute-right q-pa-md" v-if="$q.screen.gt.md && update.currency">
                   <div class="text-bold text-italic">
                     BTC Price
                   </div>
@@ -143,6 +151,7 @@
           </q-card-section>
           <div class="row q-pb-md q-px-md q-col-gutter-md gt-sm">
 
+              <div class="col">
               <q-btn
                 unelevated
                 color="primary"
@@ -172,7 +181,7 @@
               :callback="updateBalanceCallback"
               :small_btn="false"
             ></lnbits-update-balance>
-</div>
+          </div></div>
         </q-card>
        
         <q-card
diff --git a/lnbits/static/js/components.js b/lnbits/static/js/components.js
index 1d3bdc50d..9c725bc10 100644
--- a/lnbits/static/js/components.js
+++ b/lnbits/static/js/components.js
@@ -484,7 +484,7 @@ window.app.component('lnbits-dynamic-chips', {
 window.app.component('lnbits-update-balance', {
   template: '#lnbits-update-balance',
   mixins: [window.windowMixin],
-  props: ['wallet_id', 'credit-value'],
+  props: ['wallet_id', 'credit-value', 'small_btn'],
   computed: {
     denomination() {
       return LNBITS_DENOMINATION
diff --git a/lnbits/static/js/wallet.js b/lnbits/static/js/wallet.js
index 78f86aaac..e51375dba 100644
--- a/lnbits/static/js/wallet.js
+++ b/lnbits/static/js/wallet.js
@@ -62,7 +62,9 @@ window.app = Vue.createApp({
       isPrioritySwapped: false,
       fiatTracking: false,
       formattedFiatAmount: 0,
-      exchangeRate: 0
+      exchangeRate: 0,
+      formattedExchange: null,
+      ignoreWatcher: true
     }
   },
   computed: {
@@ -73,14 +75,6 @@ window.app = Vue.createApp({
         return LNbits.utils.formatSat(this.balance || this.g.wallet.sat)
       }
     },
-    formattedExchange() {
-      if (this.fiatTracking) {
-        return LNbits.utils.formatCurrency(
-          this.exchangeRate,
-          this.g.wallet.currency
-        )
-      }
-    },
     canPay() {
       if (!this.parse.invoice) return false
       return this.parse.invoice.sat <= this.balance
@@ -101,10 +95,15 @@ window.app = Vue.createApp({
   },
   methods: {
     formatFiatAmount(amount, currency) {
+      this.update.currency = currency
       this.formattedFiatAmount = LNbits.utils.formatCurrency(
         amount.toFixed(2),
         currency
       )
+      this.formattedExchange = LNbits.utils.formatCurrency(
+          this.exchangeRate,
+          currency
+        )
     },
     msatoshiFormat(value) {
       return LNbits.utils.formatSat(value / 1000)
@@ -548,16 +547,19 @@ window.app = Vue.createApp({
         })
     },
     updateFiatBalance(currency) {
+      // set rate from local storage to avoid clunky api calls
       this.exchangeRate = this.$q.localStorage.getItem('lnbits.exchangeRate')
       this.fiatBalance =
-        (this.exchangeRate / 100000000) * (this.g.wallet.sat)
+        (this.exchangeRate / 100000000) * (this.balance || this.g.wallet.sat)
+      this.formatFiatAmount(this.fiatBalance, currency)
+      // make api call
       LNbits.api
       .request('GET', `/api/v1/rate/` + currency, null)
         .then(response => {
           this.fiatBalance =
-          (response.data.rate / 100000000) *
-          (this.g.wallet.sat)
-        this.exchangeRate = response.data.rate.toFixed(2)
+          (response.data.price / 100000000) *
+          (this.balance || this.g.wallet.sat)
+        this.exchangeRate = response.data.price.toFixed(2)
         this.fiatTracking = true
         this.formatFiatAmount(this.fiatBalance, currency)
         this.$q.localStorage.set('lnbits.exchangeRate', this.exchangeRate)
@@ -675,7 +677,7 @@ window.app = Vue.createApp({
     },
     handleFiatTracking() {
       if (this.fiatTracking === false) {
-        this.updateWallet({ currency: ''})
+        this.update.currency = ''
         this.$q.localStorage.setItem(
           'lnbits.isPrioritySwapped',
           false
@@ -695,7 +697,11 @@ window.app = Vue.createApp({
     if (this.$q.screen.lt.md) {
       this.mobileSimple = true
     }
+    setTimeout(() => {
+      this.ignoreWatcher = false
+    }, 3000)
     if(this.g.wallet.currency){
+      this.fiatTracking = true
       this.updateFiatBalance(this.g.wallet.currency)
     }
     this.update.name = this.g.wallet.name
@@ -711,6 +717,7 @@ window.app = Vue.createApp({
       this.fetchBalance()
     },
     'update.currency'(newValue) {
+      if (this.ignoreWatcher) return
       this.updateWallet({ currency: newValue })
       this.updateFiatBalance(newValue)
     }
diff --git a/lnbits/templates/components.vue b/lnbits/templates/components.vue
index 955670aed..195ecd729 100644
--- a/lnbits/templates/components.vue
+++ b/lnbits/templates/components.vue
@@ -506,7 +506,31 @@
 </template>
 
 <template id="lnbits-update-balance">
-  <q-btn v-if="admin" :label="$t('credit_debit')" color="secondary" size="sm">
+  <q-btn v-if="admin && small_btn" flat round color="primary" size="sm" icon="add">
+    <q-popup-edit class="bg-accent text-white" v-slot="scope" v-model="credit">
+      <q-input
+        filled
+        :label="$t('credit_label', {denomination: denomination})"
+        v-model="scope.value"
+        dense
+        autofocus
+        @keyup.enter="scope.set"
+      >
+        <template v-slot:append>
+          <q-icon name="edit" />
+        </template>
+      </q-input>
+    </q-popup-edit>
+    <q-tooltip v-text="$t('credit_hint')"></q-tooltip>
+  </q-btn>
+  
+    <q-btn 
+    v-if="admin && !small_btn"
+    color="primary"
+    :label="$t('credit_debit')"
+    class="float-right q-mt-sm"
+    size="sm"
+    >
     <q-popup-edit class="bg-accent text-white" v-slot="scope" v-model="credit">
       <q-input
         filled

From 5997fd74fa36d69b57c80f4cdf4203407b0aa1f5 Mon Sep 17 00:00:00 2001
From: Arc <ben@arc.wales>
Date: Wed, 18 Dec 2024 23:28:42 +0000
Subject: [PATCH 10/17] format and bundle

---
 lnbits/core/migrations.py              |  6 +--
 lnbits/core/templates/core/wallet.html | 57 ++++++++++++--------------
 lnbits/static/bundle-components.min.js |  2 +-
 lnbits/static/js/wallet.js             | 35 ++++++++--------
 lnbits/templates/components.vue        | 15 +++++--
 5 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/lnbits/core/migrations.py b/lnbits/core/migrations.py
index 347f45d36..b20835cb4 100644
--- a/lnbits/core/migrations.py
+++ b/lnbits/core/migrations.py
@@ -684,13 +684,13 @@ async def m029_create_audit_table(db: Connection):
         );
         """
     )
-    
+
+
 async def m030_add_currency_to_wallet(db: Connection):
     """
     Setting currency to default is heavy, so easier just to add a trigger.
     """
     await db.execute(
-
         """
         CREATE TRIGGER IF NOT EXISTS set_default_currency
         AFTER INSERT ON wallets
@@ -702,4 +702,4 @@ async def m030_add_currency_to_wallet(db: Connection):
             WHERE id = NEW.id;
         END;
         """
-    )
\ No newline at end of file
+    )
diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html
index e707b1a4c..f4725a382 100644
--- a/lnbits/core/templates/core/wallet.html
+++ b/lnbits/core/templates/core/wallet.html
@@ -55,7 +55,7 @@
                   v-if="!isPrioritySwapped"
                   style="height: 90px"
                 >
-                  <div class="col-7" >
+                  <div class="col-7">
                     <div class="row">
                       <div class="col-auto">
                         <div class="text-h3 q-my-none text-no-wrap">
@@ -100,9 +100,7 @@
                           v-if="update.currency"
                           class="text-h3 q-my-none text-no-wrap"
                         >
-                          <strong
-                            v-text="formattedFiatAmount"
-                          ></strong>
+                          <strong v-text="formattedFiatAmount"></strong>
                         </div>
                       </div>
                       <div class="col-auto">
@@ -125,10 +123,11 @@
                   </div>
                 </div>
 
-                <div class="absolute-right q-pa-md" v-if="$q.screen.gt.md && update.currency">
-                  <div class="text-bold text-italic">
-                    BTC Price
-                  </div>
+                <div
+                  class="absolute-right q-pa-md"
+                  v-if="$q.screen.gt.md && update.currency"
+                >
+                  <div class="text-bold text-italic">BTC Price</div>
                   <span
                     class="text-bold text-italic"
                     v-text="formattedExchange"
@@ -150,8 +149,7 @@
             </div>
           </q-card-section>
           <div class="row q-pb-md q-px-md q-col-gutter-md gt-sm">
-
-              <div class="col">
+            <div class="col">
               <q-btn
                 unelevated
                 color="primary"
@@ -166,24 +164,21 @@
                 @click="showReceiveDialog"
                 :label="$t('create_invoice')"
               ></q-btn>
-              <q-btn
-                unelevated
-                color="secondary"
-                icon="qr_code_scanner"
-              >
+              <q-btn unelevated color="secondary" icon="qr_code_scanner">
                 <q-tooltip
                   ><span v-text="$t('camera_tooltip')"></span
                 ></q-tooltip>
               </q-btn>
               <lnbits-update-balance
-              v-if="$q.screen.gt.md"
-              :wallet_id="this.g.wallet.id"
-              :callback="updateBalanceCallback"
-              :small_btn="false"
-            ></lnbits-update-balance>
-          </div></div>
+                v-if="$q.screen.gt.md"
+                :wallet_id="this.g.wallet.id"
+                :callback="updateBalanceCallback"
+                :small_btn="false"
+              ></lnbits-update-balance>
+            </div>
+          </div>
         </q-card>
-       
+
         <q-card
           :style="
           $q.screen.lt.md
@@ -302,18 +297,18 @@
                               v-model="fiatTracking"
                               color="primary"
                               @update:model-value="handleFiatTracking"
-                      ></q-toggle>
+                            ></q-toggle>
                           </div>
                           <div class="col">
                             <q-select
-                            filled
-                            dense
-                            v-model="update.currency"
-                            type="text"
-                            :label="!fiatTracking ? 'Disabled' : $t('currency')"
-                            :options="receive.units.filter((u) => u !== 'sat')"
-                            :disable="!fiatTracking"
-                          ></q-select>
+                              filled
+                              dense
+                              v-model="update.currency"
+                              type="text"
+                              :label="!fiatTracking ? 'Disabled' : $t('currency')"
+                              :options="receive.units.filter((u) => u !== 'sat')"
+                              :disable="!fiatTracking"
+                            ></q-select>
                           </div>
                         </div>
                       </div>
diff --git a/lnbits/static/bundle-components.min.js b/lnbits/static/bundle-components.min.js
index 491b0b1aa..a81d2514e 100644
--- a/lnbits/static/bundle-components.min.js
+++ b/lnbits/static/bundle-components.min.js
@@ -1 +1 @@
-function generateChart(e,t){const i=t.reduce(((e,t)=>(e.labels.push(t.date),e.income.push(t.income),e.spending.push(t.spending),e.cumulative.push(t.balance),e)),{labels:[],income:[],spending:[],cumulative:[]});return new Chart(e.getContext("2d"),{type:"bar",data:{labels:i.labels,datasets:[{data:i.cumulative,type:"line",label:"balance",backgroundColor:"#673ab7",borderColor:"#673ab7",borderWidth:4,pointRadius:3,fill:!1},{data:i.income,type:"bar",label:"in",barPercentage:.75,backgroundColor:"rgba(76, 175, 80, 0.5)"},{data:i.spending,type:"bar",label:"out",barPercentage:.75,backgroundColor:"rgba(233, 30, 99, 0.5)"}]},options:{title:{text:"Chart.js Combo Time Scale"},tooltips:{mode:"index",intersect:!1},scales:{xAxes:[{type:"time",display:!0,time:{minUnit:"hour",stepSize:3}}]},animation:{duration:0},elements:{line:{tension:0}}}})}window.app.component("lnbits-funding-sources",{template:"#lnbits-funding-sources",mixins:[window.windowMixin],props:["form-data","allowed-funding-sources"],methods:{getFundingSourceLabel(e){const t=this.rawFundingSources.find((t=>t[0]===e));return t?t[1]:e}},computed:{fundingSources(){let e=[];for(const[t,i,n]of this.rawFundingSources){const i={};if(null!==n)for(let[e,t]of Object.entries(n))i[e]={label:t,value:null};e.push([t,i])}return new Map(e)},sortedAllowedFundingSources(){return this.allowedFundingSources.sort()}},data:()=>({rawFundingSources:[["VoidWallet","Void Wallet",null],["FakeWallet","Fake Wallet",{fake_wallet_secret:"Secret"}],["CoreLightningWallet","Core Lightning",{corelightning_rpc:"Endpoint",corelightning_pay_command:"Custom Pay Command"}],["CoreLightningRestWallet","Core Lightning Rest",{corelightning_rest_url:"Endpoint",corelightning_rest_cert:"Certificate",corelightning_rest_macaroon:"Macaroon"}],["LndRestWallet","Lightning Network Daemon (LND Rest)",{lnd_rest_endpoint:"Endpoint",lnd_rest_cert:"Certificate",lnd_rest_macaroon:"Macaroon",lnd_rest_macaroon_encrypted:"Encrypted Macaroon",lnd_rest_route_hints:"Enable Route Hints",lnd_rest_allow_self_payment:"Allow Self Payment"}],["LndWallet","Lightning Network Daemon (LND)",{lnd_grpc_endpoint:"Endpoint",lnd_grpc_cert:"Certificate",lnd_grpc_port:"Port",lnd_grpc_admin_macaroon:"Admin Macaroon",lnd_grpc_macaroon_encrypted:"Encrypted Macaroon"}],["LnTipsWallet","LN.Tips",{lntips_api_endpoint:"Endpoint",lntips_api_key:"API Key"}],["LNPayWallet","LN Pay",{lnpay_api_endpoint:"Endpoint",lnpay_api_key:"API Key",lnpay_wallet_key:"Wallet Key"}],["EclairWallet","Eclair (ACINQ)",{eclair_url:"URL",eclair_pass:"Password"}],["LNbitsWallet","LNbits",{lnbits_endpoint:"Endpoint",lnbits_key:"Admin Key"}],["BlinkWallet","Blink",{blink_api_endpoint:"Endpoint",blink_ws_endpoint:"WebSocket",blink_token:"Key"}],["AlbyWallet","Alby",{alby_api_endpoint:"Endpoint",alby_access_token:"Key"}],["BoltzWallet","Boltz",{boltz_client_endpoint:"Endpoint",boltz_client_macaroon:"Admin Macaroon path or hex",boltz_client_cert:"Certificate path or hex",boltz_client_wallet:"Wallet Name"}],["ZBDWallet","ZBD",{zbd_api_endpoint:"Endpoint",zbd_api_key:"Key"}],["PhoenixdWallet","Phoenixd",{phoenixd_api_endpoint:"Endpoint",phoenixd_api_password:"Key"}],["OpenNodeWallet","OpenNode",{opennode_api_endpoint:"Endpoint",opennode_key:"Key"}],["ClicheWallet","Cliche (NBD)",{cliche_endpoint:"Endpoint"}],["SparkWallet","Spark",{spark_url:"Endpoint",spark_token:"Token"}],["NWCWallet","Nostr Wallet Connect",{nwc_pairing_url:"Pairing URL"}],["BreezSdkWallet","Breez SDK",{breez_api_key:"Breez API Key",breez_greenlight_seed:"Greenlight Seed",breez_greenlight_device_key:"Greenlight Device Key",breez_greenlight_device_cert:"Greenlight Device Cert",breez_greenlight_invite_code:"Greenlight Invite Code"}]]})}),window.app.component("lnbits-extension-settings-form",{name:"lnbits-extension-settings-form",template:"#lnbits-extension-settings-form",props:["options","adminkey","endpoint"],methods:{async updateSettings(){if(!this.settings)return Quasar.Notify.create({message:"No settings to update",type:"negative"});try{const{data:e}=await LNbits.api.request("PUT",this.endpoint,this.adminkey,this.settings);this.settings=e}catch(e){LNbits.utils.notifyApiError(e)}},async getSettings(){try{const{data:e}=await LNbits.api.request("GET",this.endpoint,this.adminkey);this.settings=e}catch(e){LNbits.utils.notifyApiError(e)}},async resetSettings(){LNbits.utils.confirmDialog("Are you sure you want to reset the settings?").onOk((async()=>{try{await LNbits.api.request("DELETE",this.endpoint,this.adminkey),await this.getSettings()}catch(e){LNbits.utils.notifyApiError(e)}}))}},async created(){await this.getSettings()},data:()=>({settings:void 0})}),window.app.component("lnbits-extension-settings-btn-dialog",{template:"#lnbits-extension-settings-btn-dialog",name:"lnbits-extension-settings-btn-dialog",props:["options","adminkey","endpoint"],data:()=>({show:!1})}),window.app.component("payment-list",{name:"payment-list",template:"#payment-list",props:["update","wallet","mobileSimple","lazy"],mixins:[window.windowMixin],data(){return{denomination:LNBITS_DENOMINATION,failedPaymentsToggle:!1,payments:[],paymentsTable:{columns:[{name:"time",align:"left",label:this.$t("memo")+"/"+this.$t("date"),field:"date",sortable:!0},{name:"amount",align:"right",label:this.$t("amount")+" ("+LNBITS_DENOMINATION+")",field:"sat",sortable:!0}],pagination:{rowsPerPage:10,page:1,sortBy:"time",descending:!0,rowsNumber:10},search:null,filter:{"status[ne]":"failed"},loading:!1},exportTagName:"",exportPaymentTagList:[],paymentsCSV:{columns:[{name:"pending",align:"left",label:"Pending",field:"pending"},{name:"memo",align:"left",label:this.$t("memo"),field:"memo"},{name:"time",align:"left",label:this.$t("date"),field:"date",sortable:!0},{name:"amount",align:"right",label:this.$t("amount")+" ("+LNBITS_DENOMINATION+")",field:"sat",sortable:!0},{name:"fee",align:"right",label:this.$t("fee")+" (m"+LNBITS_DENOMINATION+")",field:"fee"},{name:"tag",align:"right",label:this.$t("tag"),field:"tag"},{name:"payment_hash",align:"right",label:this.$t("payment_hash"),field:"payment_hash"},{name:"payment_proof",align:"right",label:this.$t("payment_proof"),field:"payment_proof"},{name:"webhook",align:"right",label:this.$t("webhook"),field:"webhook"},{name:"fiat_currency",align:"right",label:"Fiat Currency",field:e=>e.extra.wallet_fiat_currency},{name:"fiat_amount",align:"right",label:"Fiat Amount",field:e=>e.extra.wallet_fiat_amount}],loading:!1}}},computed:{filteredPayments(){const e=this.paymentsTable.search;return e&&""!==e?LNbits.utils.search(this.payments,e):this.payments},paymentsOmitter(){return this.$q.screen.lt.md&&this.mobileSimple?this.payments.length>0?[this.payments[0]]:[]:this.payments},pendingPaymentsExist(){return-1!==this.payments.findIndex((e=>e.pending))}},methods:{fetchPayments(e){const t=LNbits.utils.prepareFilterQuery(this.paymentsTable,e);return LNbits.api.getPayments(this.wallet,t).then((e=>{this.paymentsTable.loading=!1,this.paymentsTable.pagination.rowsNumber=e.data.total,this.payments=e.data.data.map((e=>LNbits.map.payment(e)))})).catch((e=>{this.paymentsTable.loading=!1,LNbits.utils.notifyApiError(e)}))},paymentTableRowKey:e=>e.payment_hash+e.amount,exportCSV(e=!1){const t=this.paymentsTable.pagination,i={sortby:t.sortBy??"time",direction:t.descending?"desc":"asc"},n=new URLSearchParams(i);LNbits.api.getPayments(this.wallet,n).then((t=>{let i=t.data.data.map(LNbits.map.payment),n=this.paymentsCSV.columns;if(e){this.exportPaymentTagList.length&&(i=i.filter((e=>this.exportPaymentTagList.includes(e.tag))));const e=Object.keys(i.reduce(((e,t)=>({...e,...t.details})),{})).map((e=>({name:e,align:"right",label:e.charAt(0).toUpperCase()+e.slice(1).replace(/([A-Z])/g," $1"),field:t=>t.details[e],format:e=>"object"==typeof e?JSON.stringify(e):e})));n=this.paymentsCSV.columns.concat(e)}LNbits.utils.exportCSV(n,i,this.wallet.name+"-payments")}))},addFilterTag(){if(!this.exportTagName)return;const e=this.exportTagName.trim();this.exportPaymentTagList=this.exportPaymentTagList.filter((t=>t!==e)),this.exportPaymentTagList.push(e),this.exportTagName=""},removeExportTag(e){this.exportPaymentTagList=this.exportPaymentTagList.filter((t=>t!==e))},formatCurrency(e,t){try{return LNbits.utils.formatCurrency(e,t)}catch(t){return console.error(t),`${e} ???`}}},watch:{failedPaymentsToggle(e){this.paymentsTable.filter=!1===e?{"status[ne]":"failed"}:null,this.fetchPayments()},lazy(e){!0===e&&this.fetchPayments()},update(){this.fetchPayments()}},created(){void 0===this.lazy&&this.fetchPayments()}}),window.app.component("payment-chart",{template:"#payment-chart",name:"payment-chart",props:["wallet"],mixins:[window.windowMixin],data:()=>({paymentsChart:{show:!1,group:{value:"hour",label:"Hour"},groupOptions:[{value:"hour",label:"Hour"},{value:"day",label:"Day"},{value:"week",label:"Week"},{value:"month",label:"Month"},{value:"year",label:"Year"}],instance:null}}),methods:{showChart(){this.paymentsChart.show=!0,LNbits.api.request("GET","/api/v1/payments/history?group="+this.paymentsChart.group.value,this.wallet.adminkey).then((e=>{this.$nextTick((()=>{this.paymentsChart.instance&&this.paymentsChart.instance.destroy(),this.paymentsChart.instance=generateChart(this.$refs.canvas,e.data)}))})).catch((e=>{LNbits.utils.notifyApiError(e),this.paymentsChart.show=!1}))}}}),window.app.component(QrcodeVue),window.app.component("lnbits-extension-rating",{template:"#lnbits-extension-rating",name:"lnbits-extension-rating",props:["rating"]}),window.app.component("lnbits-fsat",{template:"<span>{{ fsat }}</span>",props:{amount:{type:Number,default:0}},computed:{fsat(){return LNbits.utils.formatSat(this.amount)}}}),window.app.component("lnbits-wallet-list",{template:"#lnbits-wallet-list",props:["balance"],data:()=>({user:null,activeWallet:null,balance:0,showForm:!1,walletName:"",LNBITS_DENOMINATION:LNBITS_DENOMINATION}),computed:{wallets(){const e=this.balance;return this.user.wallets.map((t=>(t.live_fsat=e.length&&e[0]===t.id?LNbits.utils.formatSat(e[1]):t.fsat,t)))}},methods:{createWallet(){LNbits.api.createWallet(this.user.wallets[0],this.walletName)}},created(){window.user&&(this.user=LNbits.map.user(window.user)),window.wallet&&(this.activeWallet=LNbits.map.wallet(window.wallet)),document.addEventListener("updateWalletBalance",this.updateWalletBalance)}}),window.app.component("lnbits-extension-list",{template:"#lnbits-extension-list",data:()=>({extensions:[],user:null,userExtensions:[],searchTerm:""}),watch:{searchTerm(e){this.userExtensions=this.updateUserExtensions(e)}},methods:{updateUserExtensions(e){if(!this.user)return[];const t=window.location.pathname,i=this.user.extensions;return this.extensions.filter((e=>-1!==i.indexOf(e.code))).filter((t=>!e||-1!==`${t.code} ${t.name} ${t.short_description} ${t.url}`.toLocaleLowerCase().indexOf(e.toLocaleLowerCase()))).map((e=>(e.isActive=t.startsWith(e.url),e)))}},async created(){window.user&&(this.user=LNbits.map.user(window.user));try{const{data:e}=await LNbits.api.request("GET","/api/v1/extension");this.extensions=e.map((e=>LNbits.map.extension(e))).sort(((e,t)=>e.name.localeCompare(t.name))),this.userExtensions=this.updateUserExtensions()}catch(e){LNbits.utils.notifyApiError(e)}}}),window.app.component("lnbits-manage",{template:"#lnbits-manage",props:["showAdmin","showNode","showExtensions","showUsers","showAudit"],methods:{isActive:e=>window.location.pathname===e},data:()=>({extensions:[],user:null}),created(){window.user&&(this.user=LNbits.map.user(window.user))}}),window.app.component("lnbits-payment-details",{template:"#lnbits-payment-details",props:["payment"],mixins:[window.windowMixin],data:()=>({LNBITS_DENOMINATION:LNBITS_DENOMINATION}),computed:{hasPreimage(){return this.payment.preimage&&"0000000000000000000000000000000000000000000000000000000000000000"!==this.payment.preimage},hasExpiry(){return!!this.payment.expiry},hasSuccessAction(){return this.hasPreimage&&this.payment.extra&&this.payment.extra.success_action},webhookStatusColor(){return this.payment.webhook_status>=300||this.payment.webhook_status<0?"red-10":this.payment.webhook_status?"green-10":"cyan-7"},webhookStatusText(){return this.payment.webhook_status?this.payment.webhook_status:"not sent yet"},hasTag(){return this.payment.extra&&!!this.payment.extra.tag},extras(){if(!this.payment.extra)return[];let e=_.omit(this.payment.extra,["tag","success_action"]);return Object.keys(e).map((t=>({key:t,value:e[t]})))}}}),window.app.component("lnbits-lnurlpay-success-action",{template:"#lnbits-lnurlpay-success-action",props:["payment","success_action"],data(){return{decryptedValue:this.success_action.ciphertext}},mounted(){if("aes"!==this.success_action.tag)return null;decryptLnurlPayAES(this.success_action,this.payment.preimage).then((e=>{this.decryptedValue=e}))}}),window.app.component("lnbits-qrcode",{template:"#lnbits-qrcode",mixins:[window.windowMixin],components:{QrcodeVue:QrcodeVue},props:{value:{type:String,required:!0},options:Object},data:()=>({custom:{margin:1,width:350,size:350,logo:LNBITS_QR_LOGO}}),created(){this.custom={...this.custom,...this.options}}}),window.app.component("lnbits-notifications-btn",{template:"#lnbits-notifications-btn",mixins:[window.windowMixin],props:["pubkey"],data:()=>({isSupported:!1,isSubscribed:!1,isPermissionGranted:!1,isPermissionDenied:!1}),methods:{urlB64ToUint8Array(e){const t=(e+"=".repeat((4-e.length%4)%4)).replace(/\-/g,"+").replace(/_/g,"/"),i=atob(t),n=new Uint8Array(i.length);for(let e=0;e<i.length;++e)n[e]=i.charCodeAt(e);return n},toggleNotifications(){this.isSubscribed?this.unsubscribe():this.subscribe()},saveUserSubscribed(e){let t=JSON.parse(this.$q.localStorage.getItem("lnbits.webpush.subscribedUsers"))||[];t.includes(e)||t.push(e),this.$q.localStorage.set("lnbits.webpush.subscribedUsers",JSON.stringify(t))},removeUserSubscribed(e){let t=JSON.parse(this.$q.localStorage.getItem("lnbits.webpush.subscribedUsers"))||[];t=t.filter((t=>t!==e)),this.$q.localStorage.set("lnbits.webpush.subscribedUsers",JSON.stringify(t))},isUserSubscribed(e){return(JSON.parse(this.$q.localStorage.getItem("lnbits.webpush.subscribedUsers"))||[]).includes(e)},subscribe(){this.isSupported&&!this.isPermissionDenied&&(Notification.requestPermission().then((e=>{this.isPermissionGranted="granted"===e,this.isPermissionDenied="denied"===e})).catch(console.log),navigator.serviceWorker.ready.then((e=>{navigator.serviceWorker.getRegistration().then((e=>{e.pushManager.getSubscription().then((t=>{if(null===t||!this.isUserSubscribed(this.g.user.id)){const t={applicationServerKey:this.urlB64ToUint8Array(this.pubkey),userVisibleOnly:!0};e.pushManager.subscribe(t).then((e=>{LNbits.api.request("POST","/api/v1/webpush",this.g.user.wallets[0].adminkey,{subscription:JSON.stringify(e)}).then((e=>{this.saveUserSubscribed(e.data.user),this.isSubscribed=!0})).catch(LNbits.utils.notifyApiError)}))}})).catch(console.log)}))})))},unsubscribe(){navigator.serviceWorker.ready.then((e=>{e.pushManager.getSubscription().then((e=>{e&&LNbits.api.request("DELETE","/api/v1/webpush?endpoint="+btoa(e.endpoint),this.g.user.wallets[0].adminkey).then((()=>{this.removeUserSubscribed(this.g.user.id),this.isSubscribed=!1})).catch(LNbits.utils.notifyApiError)}))})).catch(console.log)},checkSupported(){let e="https:"===window.location.protocol,t="serviceWorker"in navigator,i="Notification"in window,n="PushManager"in window;return this.isSupported=e&&t&&i&&n,this.isSupported||console.log("Notifications disabled because requirements are not met:",{HTTPS:e,"Service Worker API":t,"Notification API":i,"Push API":n}),this.isSupported},async updateSubscriptionStatus(){await navigator.serviceWorker.ready.then((e=>{e.pushManager.getSubscription().then((e=>{this.isSubscribed=!!e&&this.isUserSubscribed(this.g.user.id)}))})).catch(console.log)}},created(){this.isPermissionDenied="denied"===Notification.permission,this.checkSupported()&&this.updateSubscriptionStatus()}}),window.app.component("lnbits-dynamic-fields",{template:"#lnbits-dynamic-fields",mixins:[window.windowMixin],props:["options","modelValue"],data:()=>({formData:null,rules:[e=>!!e||"Field is required"]}),methods:{applyRules(e){return e?this.rules:[]},buildData(e,t={}){return e.reduce(((e,i)=>(i.options?.length?e[i.name]=this.buildData(i.options,t[i.name]):e[i.name]=t[i.name]??i.default,e)),{})},handleValueChanged(){this.$emit("update:model-value",this.formData)}},created(){this.formData=this.buildData(this.options,this.modelValue)}}),window.app.component("lnbits-dynamic-chips",{template:"#lnbits-dynamic-chips",mixins:[window.windowMixin],props:["modelValue"],data:()=>({chip:"",chips:[]}),methods:{addChip(){this.chip&&(this.chips.push(this.chip),this.chip="",this.$emit("update:model-value",this.chips.join(",")))},removeChip(e){this.chips.splice(e,1),this.$emit("update:model-value",this.chips.join(","))}},created(){"string"==typeof this.modelValue?this.chips=this.modelValue.split(","):this.chips=[...this.modelValue]}}),window.app.component("lnbits-update-balance",{template:"#lnbits-update-balance",mixins:[window.windowMixin],props:["wallet_id","credit-value"],computed:{denomination:()=>LNBITS_DENOMINATION,admin:()=>user.super_user},data:()=>({credit:0}),watch:{credit(e){this.updateBalance(e)}},methods:{updateBalance(e){LNbits.api.updateBalance(e,this.wallet_id).then((t=>{if(!0!==t.data.success)throw new Error(t.data);return e=parseInt(e),Quasar.Notify.create({type:"positive",message:this.$t("credit_ok",{amount:e}),icon:null}),this.$emit("credit-value",e),e})).catch(LNbits.utils.notifyApiError)}}}),window.app.use(VueQrcodeReader),window.app.use(Quasar),window.app.use(window.i18n),window.app.mount("#vue");
+function generateChart(e,t){const i=t.reduce(((e,t)=>(e.labels.push(t.date),e.income.push(t.income),e.spending.push(t.spending),e.cumulative.push(t.balance),e)),{labels:[],income:[],spending:[],cumulative:[]});return new Chart(e.getContext("2d"),{type:"bar",data:{labels:i.labels,datasets:[{data:i.cumulative,type:"line",label:"balance",backgroundColor:"#673ab7",borderColor:"#673ab7",borderWidth:4,pointRadius:3,fill:!1},{data:i.income,type:"bar",label:"in",barPercentage:.75,backgroundColor:"rgba(76, 175, 80, 0.5)"},{data:i.spending,type:"bar",label:"out",barPercentage:.75,backgroundColor:"rgba(233, 30, 99, 0.5)"}]},options:{title:{text:"Chart.js Combo Time Scale"},tooltips:{mode:"index",intersect:!1},scales:{xAxes:[{type:"time",display:!0,time:{minUnit:"hour",stepSize:3}}]},animation:{duration:0},elements:{line:{tension:0}}}})}window.app.component("lnbits-funding-sources",{template:"#lnbits-funding-sources",mixins:[window.windowMixin],props:["form-data","allowed-funding-sources"],methods:{getFundingSourceLabel(e){const t=this.rawFundingSources.find((t=>t[0]===e));return t?t[1]:e}},computed:{fundingSources(){let e=[];for(const[t,i,n]of this.rawFundingSources){const i={};if(null!==n)for(let[e,t]of Object.entries(n))i[e]={label:t,value:null};e.push([t,i])}return new Map(e)},sortedAllowedFundingSources(){return this.allowedFundingSources.sort()}},data:()=>({rawFundingSources:[["VoidWallet","Void Wallet",null],["FakeWallet","Fake Wallet",{fake_wallet_secret:"Secret"}],["CoreLightningWallet","Core Lightning",{corelightning_rpc:"Endpoint",corelightning_pay_command:"Custom Pay Command"}],["CoreLightningRestWallet","Core Lightning Rest",{corelightning_rest_url:"Endpoint",corelightning_rest_cert:"Certificate",corelightning_rest_macaroon:"Macaroon"}],["LndRestWallet","Lightning Network Daemon (LND Rest)",{lnd_rest_endpoint:"Endpoint",lnd_rest_cert:"Certificate",lnd_rest_macaroon:"Macaroon",lnd_rest_macaroon_encrypted:"Encrypted Macaroon",lnd_rest_route_hints:"Enable Route Hints",lnd_rest_allow_self_payment:"Allow Self Payment"}],["LndWallet","Lightning Network Daemon (LND)",{lnd_grpc_endpoint:"Endpoint",lnd_grpc_cert:"Certificate",lnd_grpc_port:"Port",lnd_grpc_admin_macaroon:"Admin Macaroon",lnd_grpc_macaroon_encrypted:"Encrypted Macaroon"}],["LnTipsWallet","LN.Tips",{lntips_api_endpoint:"Endpoint",lntips_api_key:"API Key"}],["LNPayWallet","LN Pay",{lnpay_api_endpoint:"Endpoint",lnpay_api_key:"API Key",lnpay_wallet_key:"Wallet Key"}],["EclairWallet","Eclair (ACINQ)",{eclair_url:"URL",eclair_pass:"Password"}],["LNbitsWallet","LNbits",{lnbits_endpoint:"Endpoint",lnbits_key:"Admin Key"}],["BlinkWallet","Blink",{blink_api_endpoint:"Endpoint",blink_ws_endpoint:"WebSocket",blink_token:"Key"}],["AlbyWallet","Alby",{alby_api_endpoint:"Endpoint",alby_access_token:"Key"}],["BoltzWallet","Boltz",{boltz_client_endpoint:"Endpoint",boltz_client_macaroon:"Admin Macaroon path or hex",boltz_client_cert:"Certificate path or hex",boltz_client_wallet:"Wallet Name"}],["ZBDWallet","ZBD",{zbd_api_endpoint:"Endpoint",zbd_api_key:"Key"}],["PhoenixdWallet","Phoenixd",{phoenixd_api_endpoint:"Endpoint",phoenixd_api_password:"Key"}],["OpenNodeWallet","OpenNode",{opennode_api_endpoint:"Endpoint",opennode_key:"Key"}],["ClicheWallet","Cliche (NBD)",{cliche_endpoint:"Endpoint"}],["SparkWallet","Spark",{spark_url:"Endpoint",spark_token:"Token"}],["NWCWallet","Nostr Wallet Connect",{nwc_pairing_url:"Pairing URL"}],["BreezSdkWallet","Breez SDK",{breez_api_key:"Breez API Key",breez_greenlight_seed:"Greenlight Seed",breez_greenlight_device_key:"Greenlight Device Key",breez_greenlight_device_cert:"Greenlight Device Cert",breez_greenlight_invite_code:"Greenlight Invite Code"}]]})}),window.app.component("lnbits-extension-settings-form",{name:"lnbits-extension-settings-form",template:"#lnbits-extension-settings-form",props:["options","adminkey","endpoint"],methods:{async updateSettings(){if(!this.settings)return Quasar.Notify.create({message:"No settings to update",type:"negative"});try{const{data:e}=await LNbits.api.request("PUT",this.endpoint,this.adminkey,this.settings);this.settings=e}catch(e){LNbits.utils.notifyApiError(e)}},async getSettings(){try{const{data:e}=await LNbits.api.request("GET",this.endpoint,this.adminkey);this.settings=e}catch(e){LNbits.utils.notifyApiError(e)}},async resetSettings(){LNbits.utils.confirmDialog("Are you sure you want to reset the settings?").onOk((async()=>{try{await LNbits.api.request("DELETE",this.endpoint,this.adminkey),await this.getSettings()}catch(e){LNbits.utils.notifyApiError(e)}}))}},async created(){await this.getSettings()},data:()=>({settings:void 0})}),window.app.component("lnbits-extension-settings-btn-dialog",{template:"#lnbits-extension-settings-btn-dialog",name:"lnbits-extension-settings-btn-dialog",props:["options","adminkey","endpoint"],data:()=>({show:!1})}),window.app.component("payment-list",{name:"payment-list",template:"#payment-list",props:["update","wallet","mobileSimple","lazy"],mixins:[window.windowMixin],data(){return{denomination:LNBITS_DENOMINATION,failedPaymentsToggle:!1,payments:[],paymentsTable:{columns:[{name:"time",align:"left",label:this.$t("memo")+"/"+this.$t("date"),field:"date",sortable:!0},{name:"amount",align:"right",label:this.$t("amount")+" ("+LNBITS_DENOMINATION+")",field:"sat",sortable:!0}],pagination:{rowsPerPage:10,page:1,sortBy:"time",descending:!0,rowsNumber:10},search:null,filter:{"status[ne]":"failed"},loading:!1},exportTagName:"",exportPaymentTagList:[],paymentsCSV:{columns:[{name:"pending",align:"left",label:"Pending",field:"pending"},{name:"memo",align:"left",label:this.$t("memo"),field:"memo"},{name:"time",align:"left",label:this.$t("date"),field:"date",sortable:!0},{name:"amount",align:"right",label:this.$t("amount")+" ("+LNBITS_DENOMINATION+")",field:"sat",sortable:!0},{name:"fee",align:"right",label:this.$t("fee")+" (m"+LNBITS_DENOMINATION+")",field:"fee"},{name:"tag",align:"right",label:this.$t("tag"),field:"tag"},{name:"payment_hash",align:"right",label:this.$t("payment_hash"),field:"payment_hash"},{name:"payment_proof",align:"right",label:this.$t("payment_proof"),field:"payment_proof"},{name:"webhook",align:"right",label:this.$t("webhook"),field:"webhook"},{name:"fiat_currency",align:"right",label:"Fiat Currency",field:e=>e.extra.wallet_fiat_currency},{name:"fiat_amount",align:"right",label:"Fiat Amount",field:e=>e.extra.wallet_fiat_amount}],loading:!1}}},computed:{filteredPayments(){const e=this.paymentsTable.search;return e&&""!==e?LNbits.utils.search(this.payments,e):this.payments},paymentsOmitter(){return this.$q.screen.lt.md&&this.mobileSimple?this.payments.length>0?[this.payments[0]]:[]:this.payments},pendingPaymentsExist(){return-1!==this.payments.findIndex((e=>e.pending))}},methods:{fetchPayments(e){const t=LNbits.utils.prepareFilterQuery(this.paymentsTable,e);return LNbits.api.getPayments(this.wallet,t).then((e=>{this.paymentsTable.loading=!1,this.paymentsTable.pagination.rowsNumber=e.data.total,this.payments=e.data.data.map((e=>LNbits.map.payment(e)))})).catch((e=>{this.paymentsTable.loading=!1,LNbits.utils.notifyApiError(e)}))},paymentTableRowKey:e=>e.payment_hash+e.amount,exportCSV(e=!1){const t=this.paymentsTable.pagination,i={sortby:t.sortBy??"time",direction:t.descending?"desc":"asc"},n=new URLSearchParams(i);LNbits.api.getPayments(this.wallet,n).then((t=>{let i=t.data.data.map(LNbits.map.payment),n=this.paymentsCSV.columns;if(e){this.exportPaymentTagList.length&&(i=i.filter((e=>this.exportPaymentTagList.includes(e.tag))));const e=Object.keys(i.reduce(((e,t)=>({...e,...t.details})),{})).map((e=>({name:e,align:"right",label:e.charAt(0).toUpperCase()+e.slice(1).replace(/([A-Z])/g," $1"),field:t=>t.details[e],format:e=>"object"==typeof e?JSON.stringify(e):e})));n=this.paymentsCSV.columns.concat(e)}LNbits.utils.exportCSV(n,i,this.wallet.name+"-payments")}))},addFilterTag(){if(!this.exportTagName)return;const e=this.exportTagName.trim();this.exportPaymentTagList=this.exportPaymentTagList.filter((t=>t!==e)),this.exportPaymentTagList.push(e),this.exportTagName=""},removeExportTag(e){this.exportPaymentTagList=this.exportPaymentTagList.filter((t=>t!==e))},formatCurrency(e,t){try{return LNbits.utils.formatCurrency(e,t)}catch(t){return console.error(t),`${e} ???`}}},watch:{failedPaymentsToggle(e){this.paymentsTable.filter=!1===e?{"status[ne]":"failed"}:null,this.fetchPayments()},lazy(e){!0===e&&this.fetchPayments()},update(){this.fetchPayments()}},created(){void 0===this.lazy&&this.fetchPayments()}}),window.app.component("payment-chart",{template:"#payment-chart",name:"payment-chart",props:["wallet"],mixins:[window.windowMixin],data:()=>({paymentsChart:{show:!1,group:{value:"hour",label:"Hour"},groupOptions:[{value:"hour",label:"Hour"},{value:"day",label:"Day"},{value:"week",label:"Week"},{value:"month",label:"Month"},{value:"year",label:"Year"}],instance:null}}),methods:{showChart(){this.paymentsChart.show=!0,LNbits.api.request("GET","/api/v1/payments/history?group="+this.paymentsChart.group.value,this.wallet.adminkey).then((e=>{this.$nextTick((()=>{this.paymentsChart.instance&&this.paymentsChart.instance.destroy(),this.paymentsChart.instance=generateChart(this.$refs.canvas,e.data)}))})).catch((e=>{LNbits.utils.notifyApiError(e),this.paymentsChart.show=!1}))}}}),window.app.component(QrcodeVue),window.app.component("lnbits-extension-rating",{template:"#lnbits-extension-rating",name:"lnbits-extension-rating",props:["rating"]}),window.app.component("lnbits-fsat",{template:"<span>{{ fsat }}</span>",props:{amount:{type:Number,default:0}},computed:{fsat(){return LNbits.utils.formatSat(this.amount)}}}),window.app.component("lnbits-wallet-list",{template:"#lnbits-wallet-list",props:["balance"],data:()=>({user:null,activeWallet:null,balance:0,showForm:!1,walletName:"",LNBITS_DENOMINATION:LNBITS_DENOMINATION}),computed:{wallets(){const e=this.balance;return this.user.wallets.map((t=>(t.live_fsat=e.length&&e[0]===t.id?LNbits.utils.formatSat(e[1]):t.fsat,t)))}},methods:{createWallet(){LNbits.api.createWallet(this.user.wallets[0],this.walletName)}},created(){window.user&&(this.user=LNbits.map.user(window.user)),window.wallet&&(this.activeWallet=LNbits.map.wallet(window.wallet)),document.addEventListener("updateWalletBalance",this.updateWalletBalance)}}),window.app.component("lnbits-extension-list",{template:"#lnbits-extension-list",data:()=>({extensions:[],user:null,userExtensions:[],searchTerm:""}),watch:{searchTerm(e){this.userExtensions=this.updateUserExtensions(e)}},methods:{updateUserExtensions(e){if(!this.user)return[];const t=window.location.pathname,i=this.user.extensions;return this.extensions.filter((e=>-1!==i.indexOf(e.code))).filter((t=>!e||-1!==`${t.code} ${t.name} ${t.short_description} ${t.url}`.toLocaleLowerCase().indexOf(e.toLocaleLowerCase()))).map((e=>(e.isActive=t.startsWith(e.url),e)))}},async created(){window.user&&(this.user=LNbits.map.user(window.user));try{const{data:e}=await LNbits.api.request("GET","/api/v1/extension");this.extensions=e.map((e=>LNbits.map.extension(e))).sort(((e,t)=>e.name.localeCompare(t.name))),this.userExtensions=this.updateUserExtensions()}catch(e){LNbits.utils.notifyApiError(e)}}}),window.app.component("lnbits-manage",{template:"#lnbits-manage",props:["showAdmin","showNode","showExtensions","showUsers","showAudit"],methods:{isActive:e=>window.location.pathname===e},data:()=>({extensions:[],user:null}),created(){window.user&&(this.user=LNbits.map.user(window.user))}}),window.app.component("lnbits-payment-details",{template:"#lnbits-payment-details",props:["payment"],mixins:[window.windowMixin],data:()=>({LNBITS_DENOMINATION:LNBITS_DENOMINATION}),computed:{hasPreimage(){return this.payment.preimage&&"0000000000000000000000000000000000000000000000000000000000000000"!==this.payment.preimage},hasExpiry(){return!!this.payment.expiry},hasSuccessAction(){return this.hasPreimage&&this.payment.extra&&this.payment.extra.success_action},webhookStatusColor(){return this.payment.webhook_status>=300||this.payment.webhook_status<0?"red-10":this.payment.webhook_status?"green-10":"cyan-7"},webhookStatusText(){return this.payment.webhook_status?this.payment.webhook_status:"not sent yet"},hasTag(){return this.payment.extra&&!!this.payment.extra.tag},extras(){if(!this.payment.extra)return[];let e=_.omit(this.payment.extra,["tag","success_action"]);return Object.keys(e).map((t=>({key:t,value:e[t]})))}}}),window.app.component("lnbits-lnurlpay-success-action",{template:"#lnbits-lnurlpay-success-action",props:["payment","success_action"],data(){return{decryptedValue:this.success_action.ciphertext}},mounted(){if("aes"!==this.success_action.tag)return null;decryptLnurlPayAES(this.success_action,this.payment.preimage).then((e=>{this.decryptedValue=e}))}}),window.app.component("lnbits-qrcode",{template:"#lnbits-qrcode",mixins:[window.windowMixin],components:{QrcodeVue:QrcodeVue},props:{value:{type:String,required:!0},options:Object},data:()=>({custom:{margin:1,width:350,size:350,logo:LNBITS_QR_LOGO}}),created(){this.custom={...this.custom,...this.options}}}),window.app.component("lnbits-notifications-btn",{template:"#lnbits-notifications-btn",mixins:[window.windowMixin],props:["pubkey"],data:()=>({isSupported:!1,isSubscribed:!1,isPermissionGranted:!1,isPermissionDenied:!1}),methods:{urlB64ToUint8Array(e){const t=(e+"=".repeat((4-e.length%4)%4)).replace(/\-/g,"+").replace(/_/g,"/"),i=atob(t),n=new Uint8Array(i.length);for(let e=0;e<i.length;++e)n[e]=i.charCodeAt(e);return n},toggleNotifications(){this.isSubscribed?this.unsubscribe():this.subscribe()},saveUserSubscribed(e){let t=JSON.parse(this.$q.localStorage.getItem("lnbits.webpush.subscribedUsers"))||[];t.includes(e)||t.push(e),this.$q.localStorage.set("lnbits.webpush.subscribedUsers",JSON.stringify(t))},removeUserSubscribed(e){let t=JSON.parse(this.$q.localStorage.getItem("lnbits.webpush.subscribedUsers"))||[];t=t.filter((t=>t!==e)),this.$q.localStorage.set("lnbits.webpush.subscribedUsers",JSON.stringify(t))},isUserSubscribed(e){return(JSON.parse(this.$q.localStorage.getItem("lnbits.webpush.subscribedUsers"))||[]).includes(e)},subscribe(){this.isSupported&&!this.isPermissionDenied&&(Notification.requestPermission().then((e=>{this.isPermissionGranted="granted"===e,this.isPermissionDenied="denied"===e})).catch(console.log),navigator.serviceWorker.ready.then((e=>{navigator.serviceWorker.getRegistration().then((e=>{e.pushManager.getSubscription().then((t=>{if(null===t||!this.isUserSubscribed(this.g.user.id)){const t={applicationServerKey:this.urlB64ToUint8Array(this.pubkey),userVisibleOnly:!0};e.pushManager.subscribe(t).then((e=>{LNbits.api.request("POST","/api/v1/webpush",this.g.user.wallets[0].adminkey,{subscription:JSON.stringify(e)}).then((e=>{this.saveUserSubscribed(e.data.user),this.isSubscribed=!0})).catch(LNbits.utils.notifyApiError)}))}})).catch(console.log)}))})))},unsubscribe(){navigator.serviceWorker.ready.then((e=>{e.pushManager.getSubscription().then((e=>{e&&LNbits.api.request("DELETE","/api/v1/webpush?endpoint="+btoa(e.endpoint),this.g.user.wallets[0].adminkey).then((()=>{this.removeUserSubscribed(this.g.user.id),this.isSubscribed=!1})).catch(LNbits.utils.notifyApiError)}))})).catch(console.log)},checkSupported(){let e="https:"===window.location.protocol,t="serviceWorker"in navigator,i="Notification"in window,n="PushManager"in window;return this.isSupported=e&&t&&i&&n,this.isSupported||console.log("Notifications disabled because requirements are not met:",{HTTPS:e,"Service Worker API":t,"Notification API":i,"Push API":n}),this.isSupported},async updateSubscriptionStatus(){await navigator.serviceWorker.ready.then((e=>{e.pushManager.getSubscription().then((e=>{this.isSubscribed=!!e&&this.isUserSubscribed(this.g.user.id)}))})).catch(console.log)}},created(){this.isPermissionDenied="denied"===Notification.permission,this.checkSupported()&&this.updateSubscriptionStatus()}}),window.app.component("lnbits-dynamic-fields",{template:"#lnbits-dynamic-fields",mixins:[window.windowMixin],props:["options","modelValue"],data:()=>({formData:null,rules:[e=>!!e||"Field is required"]}),methods:{applyRules(e){return e?this.rules:[]},buildData(e,t={}){return e.reduce(((e,i)=>(i.options?.length?e[i.name]=this.buildData(i.options,t[i.name]):e[i.name]=t[i.name]??i.default,e)),{})},handleValueChanged(){this.$emit("update:model-value",this.formData)}},created(){this.formData=this.buildData(this.options,this.modelValue)}}),window.app.component("lnbits-dynamic-chips",{template:"#lnbits-dynamic-chips",mixins:[window.windowMixin],props:["modelValue"],data:()=>({chip:"",chips:[]}),methods:{addChip(){this.chip&&(this.chips.push(this.chip),this.chip="",this.$emit("update:model-value",this.chips.join(",")))},removeChip(e){this.chips.splice(e,1),this.$emit("update:model-value",this.chips.join(","))}},created(){"string"==typeof this.modelValue?this.chips=this.modelValue.split(","):this.chips=[...this.modelValue]}}),window.app.component("lnbits-update-balance",{template:"#lnbits-update-balance",mixins:[window.windowMixin],props:["wallet_id","credit-value","small_btn"],computed:{denomination:()=>LNBITS_DENOMINATION,admin:()=>user.super_user},data:()=>({credit:0}),watch:{credit(e){this.updateBalance(e)}},methods:{updateBalance(e){LNbits.api.updateBalance(e,this.wallet_id).then((t=>{if(!0!==t.data.success)throw new Error(t.data);return e=parseInt(e),Quasar.Notify.create({type:"positive",message:this.$t("credit_ok",{amount:e}),icon:null}),this.$emit("credit-value",e),e})).catch(LNbits.utils.notifyApiError)}}}),window.app.use(VueQrcodeReader),window.app.use(Quasar),window.app.use(window.i18n),window.app.mount("#vue");
diff --git a/lnbits/static/js/wallet.js b/lnbits/static/js/wallet.js
index e51375dba..daf82d185 100644
--- a/lnbits/static/js/wallet.js
+++ b/lnbits/static/js/wallet.js
@@ -101,9 +101,9 @@ window.app = Vue.createApp({
         currency
       )
       this.formattedExchange = LNbits.utils.formatCurrency(
-          this.exchangeRate,
-          currency
-        )
+        this.exchangeRate,
+        currency
+      )
     },
     msatoshiFormat(value) {
       return LNbits.utils.formatSat(value / 1000)
@@ -554,15 +554,15 @@ window.app = Vue.createApp({
       this.formatFiatAmount(this.fiatBalance, currency)
       // make api call
       LNbits.api
-      .request('GET', `/api/v1/rate/` + currency, null)
+        .request('GET', `/api/v1/rate/` + currency, null)
         .then(response => {
           this.fiatBalance =
-          (response.data.price / 100000000) *
-          (this.balance || this.g.wallet.sat)
-        this.exchangeRate = response.data.price.toFixed(2)
-        this.fiatTracking = true
-        this.formatFiatAmount(this.fiatBalance, currency)
-        this.$q.localStorage.set('lnbits.exchangeRate', this.exchangeRate)
+            (response.data.price / 100000000) *
+            (this.balance || this.g.wallet.sat)
+          this.exchangeRate = response.data.price.toFixed(2)
+          this.fiatTracking = true
+          this.formatFiatAmount(this.fiatBalance, currency)
+          this.$q.localStorage.set('lnbits.exchangeRate', this.exchangeRate)
         })
         .catch(e => console.error(e))
     },
@@ -678,10 +678,7 @@ window.app = Vue.createApp({
     handleFiatTracking() {
       if (this.fiatTracking === false) {
         this.update.currency = ''
-        this.$q.localStorage.setItem(
-          'lnbits.isPrioritySwapped',
-          false
-        )
+        this.$q.localStorage.setItem('lnbits.isPrioritySwapped', false)
         this.$q.localStorage.remove(`lnbits.exchangeRate`)
       }
     }
@@ -700,7 +697,7 @@ window.app = Vue.createApp({
     setTimeout(() => {
       this.ignoreWatcher = false
     }, 3000)
-    if(this.g.wallet.currency){
+    if (this.g.wallet.currency) {
       this.fiatTracking = true
       this.updateFiatBalance(this.g.wallet.currency)
     }
@@ -718,7 +715,7 @@ window.app = Vue.createApp({
     },
     'update.currency'(newValue) {
       if (this.ignoreWatcher) return
-      this.updateWallet({ currency: newValue })
+      this.updateWallet({currency: newValue})
       this.updateFiatBalance(newValue)
     }
   },
@@ -729,8 +726,10 @@ window.app = Vue.createApp({
       this.$q.localStorage.set('lnbits.disclaimerShown', true)
     }
     // check blanace priority
-    if (this.$q.localStorage.getItem('lnbits.isPrioritySwapped')){
-      this.isPrioritySwapped = this.$q.localStorage.getItem('lnbits.isPrioritySwapped')
+    if (this.$q.localStorage.getItem('lnbits.isPrioritySwapped')) {
+      this.isPrioritySwapped = this.$q.localStorage.getItem(
+        'lnbits.isPrioritySwapped'
+      )
     } else {
       this.isPrioritySwapped = false
       this.$q.localStorage.setItem('lnbits.isPrioritySwapped', false)
diff --git a/lnbits/templates/components.vue b/lnbits/templates/components.vue
index 195ecd729..8011a43e0 100644
--- a/lnbits/templates/components.vue
+++ b/lnbits/templates/components.vue
@@ -506,7 +506,14 @@
 </template>
 
 <template id="lnbits-update-balance">
-  <q-btn v-if="admin && small_btn" flat round color="primary" size="sm" icon="add">
+  <q-btn
+    v-if="admin && small_btn"
+    flat
+    round
+    color="primary"
+    size="sm"
+    icon="add"
+  >
     <q-popup-edit class="bg-accent text-white" v-slot="scope" v-model="credit">
       <q-input
         filled
@@ -523,14 +530,14 @@
     </q-popup-edit>
     <q-tooltip v-text="$t('credit_hint')"></q-tooltip>
   </q-btn>
-  
-    <q-btn 
+
+  <q-btn
     v-if="admin && !small_btn"
     color="primary"
     :label="$t('credit_debit')"
     class="float-right q-mt-sm"
     size="sm"
-    >
+  >
     <q-popup-edit class="bg-accent text-white" v-slot="scope" v-model="credit">
       <q-input
         filled

From 6f44b755e4509c9deae24492b55e3450558967e8 Mon Sep 17 00:00:00 2001
From: arcbtc <ben@arc.wales>
Date: Thu, 19 Dec 2024 13:22:06 +0000
Subject: [PATCH 11/17] default in create_wallet

---
 lnbits/core/crud/wallets.py |  1 +
 lnbits/core/migrations.py   | 21 +--------------------
 lnbits/static/js/wallet.js  |  3 ++-
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/lnbits/core/crud/wallets.py b/lnbits/core/crud/wallets.py
index f3f3f2039..e63a6991a 100644
--- a/lnbits/core/crud/wallets.py
+++ b/lnbits/core/crud/wallets.py
@@ -23,6 +23,7 @@ async def create_wallet(
         user=user_id,
         adminkey=uuid4().hex,
         inkey=uuid4().hex,
+        currency='USD',
     )
     await (conn or db).insert("wallets", wallet)
     return wallet
diff --git a/lnbits/core/migrations.py b/lnbits/core/migrations.py
index b20835cb4..99bb00575 100644
--- a/lnbits/core/migrations.py
+++ b/lnbits/core/migrations.py
@@ -683,23 +683,4 @@ async def m029_create_audit_table(db: Connection):
             created_at TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
         );
         """
-    )
-
-
-async def m030_add_currency_to_wallet(db: Connection):
-    """
-    Setting currency to default is heavy, so easier just to add a trigger.
-    """
-    await db.execute(
-        """
-        CREATE TRIGGER IF NOT EXISTS set_default_currency
-        AFTER INSERT ON wallets
-        FOR EACH ROW
-        WHEN NEW.currency IS NULL
-        BEGIN
-            UPDATE wallets
-            SET currency = 'USD'
-            WHERE id = NEW.id;
-        END;
-        """
-    )
+    )
\ No newline at end of file
diff --git a/lnbits/static/js/wallet.js b/lnbits/static/js/wallet.js
index daf82d185..11dfabd74 100644
--- a/lnbits/static/js/wallet.js
+++ b/lnbits/static/js/wallet.js
@@ -679,6 +679,7 @@ window.app = Vue.createApp({
       if (this.fiatTracking === false) {
         this.update.currency = ''
         this.$q.localStorage.setItem('lnbits.isPrioritySwapped', false)
+        this.isPrioritySwapped = false
         this.$q.localStorage.remove(`lnbits.exchangeRate`)
       }
     }
@@ -726,7 +727,7 @@ window.app = Vue.createApp({
       this.$q.localStorage.set('lnbits.disclaimerShown', true)
     }
     // check blanace priority
-    if (this.$q.localStorage.getItem('lnbits.isPrioritySwapped')) {
+    if (this.$q.localStorage.getItem('lnbits.isPrioritySwapped') && this.g.wallet.currenc) {
       this.isPrioritySwapped = this.$q.localStorage.getItem(
         'lnbits.isPrioritySwapped'
       )

From fa61016ed17c0c74f324597ff890bb5a5319cd65 Mon Sep 17 00:00:00 2001
From: Arc <ben@arc.wales>
Date: Thu, 19 Dec 2024 13:31:06 +0000
Subject: [PATCH 12/17] bundle

---
 lnbits/core/crud/wallets.py | 2 +-
 lnbits/core/migrations.py   | 2 +-
 lnbits/static/js/wallet.js  | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lnbits/core/crud/wallets.py b/lnbits/core/crud/wallets.py
index e63a6991a..94d45e43d 100644
--- a/lnbits/core/crud/wallets.py
+++ b/lnbits/core/crud/wallets.py
@@ -23,7 +23,7 @@ async def create_wallet(
         user=user_id,
         adminkey=uuid4().hex,
         inkey=uuid4().hex,
-        currency='USD',
+        currency="USD",
     )
     await (conn or db).insert("wallets", wallet)
     return wallet
diff --git a/lnbits/core/migrations.py b/lnbits/core/migrations.py
index 99bb00575..2d4f059c8 100644
--- a/lnbits/core/migrations.py
+++ b/lnbits/core/migrations.py
@@ -683,4 +683,4 @@ async def m029_create_audit_table(db: Connection):
             created_at TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
         );
         """
-    )
\ No newline at end of file
+    )
diff --git a/lnbits/static/js/wallet.js b/lnbits/static/js/wallet.js
index 11dfabd74..de0679a9d 100644
--- a/lnbits/static/js/wallet.js
+++ b/lnbits/static/js/wallet.js
@@ -727,7 +727,10 @@ window.app = Vue.createApp({
       this.$q.localStorage.set('lnbits.disclaimerShown', true)
     }
     // check blanace priority
-    if (this.$q.localStorage.getItem('lnbits.isPrioritySwapped') && this.g.wallet.currenc) {
+    if (
+      this.$q.localStorage.getItem('lnbits.isPrioritySwapped') &&
+      this.g.wallet.currenc
+    ) {
       this.isPrioritySwapped = this.$q.localStorage.getItem(
         'lnbits.isPrioritySwapped'
       )

From b23e8ea781ca7a0dbaf889a2d5c57e7ba4c3fbdd Mon Sep 17 00:00:00 2001
From: arcbtc <ben@arc.wales>
Date: Thu, 19 Dec 2024 13:35:53 +0000
Subject: [PATCH 13/17] bug

---
 lnbits/static/js/wallet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/static/js/wallet.js b/lnbits/static/js/wallet.js
index 11dfabd74..0bc7f08db 100644
--- a/lnbits/static/js/wallet.js
+++ b/lnbits/static/js/wallet.js
@@ -727,7 +727,7 @@ window.app = Vue.createApp({
       this.$q.localStorage.set('lnbits.disclaimerShown', true)
     }
     // check blanace priority
-    if (this.$q.localStorage.getItem('lnbits.isPrioritySwapped') && this.g.wallet.currenc) {
+    if (this.$q.localStorage.getItem('lnbits.isPrioritySwapped')) {
       this.isPrioritySwapped = this.$q.localStorage.getItem(
         'lnbits.isPrioritySwapped'
       )

From 07eb0ecdde3988e78faba81f247c53bcb132e6b6 Mon Sep 17 00:00:00 2001
From: arcbtc <ben@arc.wales>
Date: Thu, 19 Dec 2024 13:37:11 +0000
Subject: [PATCH 14/17] bug

---
 lnbits/static/js/wallet.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lnbits/static/js/wallet.js b/lnbits/static/js/wallet.js
index 0b2b4a571..9eeaa1ef9 100644
--- a/lnbits/static/js/wallet.js
+++ b/lnbits/static/js/wallet.js
@@ -728,9 +728,7 @@ window.app = Vue.createApp({
     }
     // check blanace priority
     if (
-      this.$q.localStorage.getItem('lnbits.isPrioritySwapped') &&
-      this.g.wallet.currency
-    ) {
+      this.$q.localStorage.getItem('lnbits.isPrioritySwapped')) {
       this.isPrioritySwapped = this.$q.localStorage.getItem(
         'lnbits.isPrioritySwapped'
       )

From 85b2f30a1aaaa06e8dc4fe085f10bad90a4f52d5 Mon Sep 17 00:00:00 2001
From: Arc <ben@arc.wales>
Date: Thu, 19 Dec 2024 13:38:25 +0000
Subject: [PATCH 15/17] format

---
 lnbits/static/js/wallet.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lnbits/static/js/wallet.js b/lnbits/static/js/wallet.js
index 9eeaa1ef9..0bc7f08db 100644
--- a/lnbits/static/js/wallet.js
+++ b/lnbits/static/js/wallet.js
@@ -727,8 +727,7 @@ window.app = Vue.createApp({
       this.$q.localStorage.set('lnbits.disclaimerShown', true)
     }
     // check blanace priority
-    if (
-      this.$q.localStorage.getItem('lnbits.isPrioritySwapped')) {
+    if (this.$q.localStorage.getItem('lnbits.isPrioritySwapped')) {
       this.isPrioritySwapped = this.$q.localStorage.getItem(
         'lnbits.isPrioritySwapped'
       )

From 1a4c706ed45173fe1fb4e6e58cfbe1204853d629 Mon Sep 17 00:00:00 2001
From: arcbtc <ben@arc.wales>
Date: Thu, 19 Dec 2024 20:10:15 +0000
Subject: [PATCH 16/17] fixed merge bug

---
 lnbits/static/js/wallet.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lnbits/static/js/wallet.js b/lnbits/static/js/wallet.js
index 704e6d266..5b67279f5 100644
--- a/lnbits/static/js/wallet.js
+++ b/lnbits/static/js/wallet.js
@@ -719,6 +719,7 @@ window.app = Vue.createApp({
       if (this.ignoreWatcher) return
       this.updateWallet({currency: newValue})
       this.updateFiatBalance(newValue)
+    },
     '$q.screen.gt.sm'(value) {
       if (value == true) {
         this.mobileSimple = false

From 3c0c1ca93062b52c73cc7199e6f6ea117d439715 Mon Sep 17 00:00:00 2001
From: arcbtc <ben@arc.wales>
Date: Thu, 19 Dec 2024 20:25:59 +0000
Subject: [PATCH 17/17] small bug

---
 lnbits/static/js/wallet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/static/js/wallet.js b/lnbits/static/js/wallet.js
index 5b67279f5..2bb0dfb79 100644
--- a/lnbits/static/js/wallet.js
+++ b/lnbits/static/js/wallet.js
@@ -716,7 +716,7 @@ window.app = Vue.createApp({
       this.fetchBalance()
     },
     'update.currency'(newValue) {
-      if (this.ignoreWatcher) return
+      if (this.ignoreWatcher || this.update.currency == '') return
       this.updateWallet({currency: newValue})
       this.updateFiatBalance(newValue)
     },