diff --git a/lnbits/extensions/tpos/templates/tpos/tpos.html b/lnbits/extensions/tpos/templates/tpos/tpos.html
index c66238f76..0f9620a96 100644
--- a/lnbits/extensions/tpos/templates/tpos/tpos.html
+++ b/lnbits/extensions/tpos/templates/tpos/tpos.html
@@ -13,7 +13,7 @@
     <q-page-sticky v-if="exchangeRate" expand position="top">
       <div class="row justify-center full-width">
         <div class="col-12 col-sm-8 col-md-6 col-lg-4 text-center">
-          <h3 class="q-mb-md">{% raw %}{{ famount }}{% endraw %}</h3>
+          <h3 class="q-mb-md">{% raw %}{{ amountFormatted }}{% endraw %}</h3>
           <h5 class="q-mt-none q-mb-sm">
             {% raw %}{{ fsat }}{% endraw %} <small>sat</small>
           </h5>
@@ -173,12 +173,14 @@
           ></qrcode>
         </q-responsive>
         <div class="text-center">
-          <h3 class="q-my-md">{% raw %}{{ famount }}{% endraw %}</h3>
+          <h3 class="q-my-md">
+            {% raw %}{{ amountWithTipFormatted }}{% endraw %}
+          </h3>
           <h5 class="q-mt-none">
             {% raw %}{{ fsat }}
             <small>sat</small>
             <span v-show="tip_options" style="font-size: 0.75rem"
-              >( + {{ tipAmountSat }} tip)</span
+              >( + {{ tipAmountFormatted }} tip)</span
             >
             {% endraw %}
           </h5>
@@ -360,21 +362,31 @@
     computed: {
       amount: function () {
         if (!this.stack.length) return 0.0
-        return (Number(this.stack.join('')) / 100).toFixed(2)
+        return Number(this.stack.join('') / 100)
       },
-      famount: function () {
-        return LNbits.utils.formatCurrency(this.amount, this.currency)
+      amountFormatted: function () {
+        return LNbits.utils.formatCurrency(
+          this.amount.toFixed(2),
+          this.currency
+        )
+      },
+      amountWithTipFormatted: function () {
+        return LNbits.utils.formatCurrency(
+          (this.amount + this.tipAmount).toFixed(2),
+          this.currency
+        )
       },
       sat: function () {
         if (!this.exchangeRate) return 0
-        return Math.ceil(
-          ((this.amount - this.tipAmount) / this.exchangeRate) * 100000000
-        )
+        return Math.ceil((this.amount / this.exchangeRate) * 100000000)
       },
       tipAmountSat: function () {
         if (!this.exchangeRate) return 0
         return Math.ceil((this.tipAmount / this.exchangeRate) * 100000000)
       },
+      tipAmountFormatted: function () {
+        return LNbits.utils.formatSat(this.tipAmountSat)
+      },
       fsat: function () {
         return LNbits.utils.formatSat(this.sat)
       }
@@ -392,26 +404,12 @@
       processTipSelection: function (selectedTipOption) {
         this.tipDialog.show = false
 
-        if (selectedTipOption) {
-          const tipAmount = parseFloat(
-            parseFloat((selectedTipOption / 100) * this.amount)
-          )
-          const subtotal = parseFloat(this.amount)
-          const grandTotal = parseFloat((tipAmount + subtotal).toFixed(2))
-          const totalString = grandTotal.toFixed(2).toString()
-
-          this.stack = []
-          for (var i = 0; i < totalString.length; i++) {
-            const char = totalString[i]
-
-            if (char !== '.') {
-              this.stack.push(char)
-            }
-          }
-
-          this.tipAmount = tipAmount
+        if (!selectedTipOption) {
+          this.tipAmount = 0.0
+          return this.showInvoice()
         }
 
+        this.tipAmount = (selectedTipOption / 100) * this.amount
         this.showInvoice()
       },
       submitForm: function () {