FakeWallet own denomination now working

lnbits/core/static/js/wallet.js

@@ -161,14 +161,14 @@ new Vue({
           {
             name: 'sat',
             align: 'right',
-            label: 'Amount (sat)',
+            label: 'Amount (' + LNBITS_DENOMINATION + ')',
             field: 'sat',
             sortable: true
           },
           {
             name: 'fee',
             align: 'right',
-            label: 'Fee (msat)',
+            label: 'Fee (m' + LNBITS_DENOMINATION + ')',
             field: 'fee'
           }
         ],
@@ -191,7 +191,11 @@ new Vue({
   },
   computed: {
     formattedBalance: function () {
-      return LNbits.utils.formatSat(this.balance || this.g.wallet.sat)
+      if (LNBITS_DENOMINATION != 'sats') {
+        return this.balance / 100
+      } else {
+        return LNbits.utils.formatSat(this.balance || this.g.wallet.sat)
+      }
     },
     filteredPayments: function () {
       var q = this.paymentsTable.filter
@@ -250,28 +254,27 @@ new Vue({
       this.parse.data.paymentChecker = null
       this.parse.camera.show = false
     },
-    updateBalance: function(credit){
+    updateBalance: function (credit) {
+      if (LNBITS_DENOMINATION != 'sats') {
+        credit = credit * 100
+      }
       LNbits.api
-          .request(
-            'PUT',
-            '/api/v1/wallet/balance/' + credit,
-            this.g.wallet.inkey
-          )
-          .catch(err => {
-            LNbits.utils.notifyApiError(err)
-          })
-          .then(response => {
-            let data = response.data
-            if (data.status === 'ERROR') {
-              this.$q.notify({
-                timeout: 5000,
-                type: 'warning',
-                message: `Failed to update.`,
-              })
-              return
-            }
-            this.balance = this.balance + data.balance
-          })
+        .request('PUT', '/api/v1/wallet/balance/' + credit, this.g.wallet.inkey)
+        .catch(err => {
+          LNbits.utils.notifyApiError(err)
+        })
+        .then(response => {
+          let data = response.data
+          if (data.status === 'ERROR') {
+            this.$q.notify({
+              timeout: 5000,
+              type: 'warning',
+              message: `Failed to update.`
+            })
+            return
+          }
+          this.balance = this.balance + data.balance
+        })
     },
     closeReceiveDialog: function () {
       setTimeout(() => {
@@ -295,7 +298,9 @@ new Vue({
     },
     createInvoice: function () {
       this.receive.status = 'loading'
-
+      if (LNBITS_DENOMINATION != 'sats') {
+        this.receive.data.amount = this.receive.data.amount * 100
+      }
       LNbits.api
         .createInvoice(
           this.g.wallet,

lnbits/core/templates/core/wallet.html

@@ -35,7 +35,9 @@
                 v-model="scope.value"
                 dense
                 autofocus
-                type="number"
+                mask="#.##"
+                fill-mask="0"
+                reverse-fill-mask
                 @keyup.enter="updateBalance(scope.value)"
               >
                 <template v-slot:append>
@@ -169,7 +171,17 @@
                 <q-tooltip>{{ props.row.date }}</q-tooltip>
                 {{ props.row.dateFrom }}
               </q-td>
-              <q-td auto-width key="sat" :props="props">
+              {% endraw %}
+              <q-td
+                auto-width
+                key="sat"
+                v-if="'{{LNBITS_DENOMINATION}}' != 'sats'"
+                :props="props"
+                >{% raw %} {{ parseFloat(String(props.row.fsat).replaceAll(",",
+                "")) / 100 }}
+              </q-td>
+
+              <q-td auto-width key="sat" v-else :props="props">
                 {{ props.row.fsat }}
               </q-td>
               <q-td auto-width key="fee" :props="props">
@@ -251,7 +263,7 @@
     <q-card>
       <q-card-section>
         <h6 class="text-subtitle1 q-mt-none q-mb-sm">
-          {{ SITE_TITLE }} wallet: <strong><em>{{ wallet.name }}</em></strong>
+          {{ SITE_TITLE }} Wallet: <strong><em>{{ wallet.name }}</em></strong>
         </h6>
       </q-card-section>
       <q-card-section class="q-pa-none">
@@ -370,13 +382,15 @@
         filled
         dense
         v-model.number="receive.data.amount"
-        type="number"
-        :label="`Amount ({{LNBITS_DENOMINATION}}) *`"
+        label="Amount ({{LNBITS_DENOMINATION}}) *"
+        mask="#.##"
+        fill-mask="0"
+        reverse-fill-mask
         :min="receive.minMax[0]"
         :max="receive.minMax[1]"
         :readonly="receive.lnurl && receive.lnurl.fixed"
-      ></q-input
-      >{% else %}
+      ></q-input>
+      {% else %}
       <q-select
         filled
         dense
@@ -390,24 +404,24 @@
         dense
         v-model.number="receive.data.amount"
         type="number"
-        :label="`Amount (${receive.unit}) *`"
+        label="Amount ({{LNBITS_DENOMINATION}}) *"
         :step="receive.unit != 'sat' ? '0.001' : '1'"
         :min="receive.minMax[0]"
         :max="receive.minMax[1]"
         :readonly="receive.lnurl && receive.lnurl.fixed"
       ></q-input>
-      {% endif %} {% raw %}
+      {% endif %}
 
       <q-input
         filled
         dense
         v-model.trim="receive.data.memo"
-        label="Memo *"
-        placeholder="LNbits invoice"
+        label="Memo"
       ></q-input>
+      {% raw %}
       <div v-if="receive.status == 'pending'" class="row q-mt-lg">
         <q-btn
-          unelevated
+          unelevatedamountamount
           color="primary"
           :disable="receive.data.memo == null || receive.data.amount == null || receive.data.amount <= 0"
           type="submit"
@@ -451,9 +465,12 @@
 <q-dialog v-model="parse.show" @hide="closeParseDialog">
   <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
     <div v-if="parse.invoice">
-      {% raw %}
-      <h6 class="q-my-none">
-        {{ parse.invoice.fsat }} {{LNBITS_DENOMINATION}}
+      <h6 v-if="'{{LNBITS_DENOMINATION}}' != 'sats'" class="q-my-none">
+        {% raw %} {{ parseFloat(String(parse.invoice.fsat).replaceAll(",", ""))
+        / 100 }} {% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
+      </h6>
+      <h6 v-else class="q-my-none">
+        {{ parse.invoice.fsat }}{% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
       </h6>
       <q-separator class="q-my-sm"></q-separator>
       <p class="text-wrap">
@@ -532,6 +549,7 @@
         </div>
         <div class="row">
           <div class="col">
+            {% endraw %}
             <q-input
               filled
               dense
@@ -542,6 +560,7 @@
               :max="parse.lnurlpay.maxSendable / 1000"
               :readonly="parse.lnurlpay.fixed"
             ></q-input>
+            {% raw %}
           </div>
           <div class="col-8 q-pl-md" v-if="parse.lnurlpay.commentAllowed > 0">
             <q-input

lnbits/static/js/components.js

@@ -22,7 +22,8 @@ Vue.component('lnbits-wallet-list', {
       activeWallet: null,
       activeBalance: [],
       showForm: false,
-      walletName: ''
+      walletName: '',
+      LNBITS_DENOMINATION: LNBITS_DENOMINATION
     }
   },
   template: `
@@ -43,7 +44,8 @@ Vue.component('lnbits-wallet-list', {
         </q-item-section>
         <q-item-section>
           <q-item-label lines="1">{{ wallet.name }}</q-item-label>
-          <q-item-label caption>{{ wallet.live_fsat }} sat</q-item-label>
+          <q-item-label v-if="LNBITS_DENOMINATION != 'sats'" caption>{{ parseFloat(String(wallet.live_fsat).replaceAll(",", "")) / 100  }} {{ LNBITS_DENOMINATION }}</q-item-label>
+          <q-item-label v-else caption>{{ wallet.live_fsat }} {{ LNBITS_DENOMINATION }}</q-item-label>
         </q-item-section>
         <q-item-section side v-show="activeWallet && activeWallet.id === wallet.id">
           <q-icon name="chevron_right" color="grey-5" size="md"></q-icon>
@@ -194,11 +196,11 @@ Vue.component('lnbits-payment-details', {
       </div>
       <div class="row">
         <div class="col-3"><b>Amount</b>:</div>
-        <div class="col-9">{{ (payment.amount / 1000).toFixed(3) }} sat</div>
+        <div class="col-9">{{ (payment.amount / 1000).toFixed(3) }} {{LNBITS_DENOMINATION}}</div>
       </div>
       <div class="row">
         <div class="col-3"><b>Fee</b>:</div>
-        <div class="col-9">{{ (payment.fee / 1000).toFixed(3) }} sat</div>
+        <div class="col-9">{{ (payment.fee / 1000).toFixed(3) }} {{LNBITS_DENOMINATION}}</div>
       </div>
       <div class="row">
         <div class="col-3"><b>Payment hash</b>:</div>

lnbits/templates/base.html

@@ -192,6 +192,8 @@
     <script src="/static/js/components.js"></script>
     <script type="text/javascript">
       const themes = {{ LNBITS_THEME_OPTIONS  | tojson }}
+      const LNBITS_DENOMINATION = {{ LNBITS_DENOMINATION   | tojson}}
+      console.log(LNBITS_DENOMINATION)
       if(themes && themes.length) {
         window.allowedThemes = themes.map(str => str.trim())
       }