#6 code clean-up and some bug fixes

bitcoincoretech · Jun 10, 2021 · 98f2fc1 · 98f2fc1
1 parent 6af6579
commit 98f2fc1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 56 deletions.
diff --git a/src/components/LnurlAuth.vue b/src/components/LnurlAuth.vue
@@ -27,9 +27,9 @@
     <div v-else>
       <payment-status
         v-if="currentView === 'authStatus'"
-        :isPayed="withdrawStatus.isPayed"
-        :message="withdrawStatus.message"
-        :details="withdrawStatus.details"
+        :isPayed="authStatus.isPayed"
+        :message="authStatus.message"
+        :details="authStatus.details"
       ></payment-status>
       <error-card
         v-else-if="currentView === 'error'"
@@ -47,15 +47,15 @@
 </template>
 <script>
 import lnbitsApi from '../services/lnbits-api.svc'
+import configSvc from '../services/config.svc'
 
 export default {
   name: 'lnurl-auth',
   props: {
-    lnurlauth: object,
+    lnurlauth: Object,
   },
   data() {
     return {
-      paymentChecker: null,
       currentView: 'auth',
       authStatus: {
         isPayed: false,
@@ -69,6 +69,10 @@ export default {
       },
     }
   },
+  mounted: async function () {
+    this.serverUrl = await configSvc.getServerUrl()
+    this.activeWallet = await configSvc.getActiveWallet()
+  },
   methods: {
     authLnurl: async function () {
       try {

diff --git a/src/components/PayInvoice.vue b/src/components/PayInvoice.vue
@@ -17,30 +17,6 @@
       </lnurl-pay>
       <lnurl-withdraw v-else-if="showLnurlWithdrawDetails" :receive="receive"> </lnurl-withdraw>
       <lnurl-auth v-else-if="showLnurlAuthDetails" :lnurlauth="parse.lnurlauth"> </lnurl-auth>
-      <div v-else-if="showPaymentStatus">
-        <q-card-section dark bordered>
-          <p class="text-center">
-            <q-icon v-if="paymentDetails.isPayed" name="check_circle" size="5.5em" color="green" />
-            <q-spinner-bars v-else color="purple" size="5.5em" />
-          </p>
-          <p class="q-my-none text-h6 text-center">{{ paymentDetails.message }}</p>
-          <q-expansion-item
-            v-if="paymentDetails.details && paymentDetails.details.length"
-            group="extras"
-            icon="info"
-            class="bg-yellow-1"
-            label="Details"
-          >
-            <span v-html="paymentDetails.details"></span>
-          </q-expansion-item>
-        </q-card-section>
-
-        <div class="row q-mt-lg">
-          <q-space />
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto cursor-pointer">Close</q-btn>
-          <q-space />
-        </div>
-      </div>
       <div v-else-if="showErrorDetais">
         <q-card-section dark bordered class="bg-red-5">
           <div class="text-h6">{{ error.title }}</div>
@@ -103,11 +79,6 @@ export default {
         },
         paymentChecker: null,
       },
-      paymentDetails: {
-        isPayed: false,
-        message: '...',
-        details: '',
-      },
       receive: {
         show: false,
         status: 'pending',
@@ -139,9 +110,6 @@ export default {
     showErrorDetais: function () {
       return this.currentView === 'error'
     },
-    showPaymentStatus: function () {
-      return this.currentView === 'paymentStatus'
-    },
   },
 
   methods: {
@@ -238,26 +206,14 @@ export default {
 
       return cleanInvoice
     },
-    closeDialog() {
+    closeDialog: function () {
       this.$browser.runtime.sendMessage('hide_iframe')
     },
-    showErrorCard(err, title = 'Error') {
+    showErrorCard: function (err, title = 'Error') {
       this.currentView = 'error'
       this.error.title = title
       this.error.message = (err.message || err) + '.'
     },
-    showPaymentInProgressCard(message = 'Processing payment...') {
-      this.currentView = 'paymentStatus'
-      this.paymentDetails.isPayed = false
-      this.paymentDetails.message = message
-      this.paymentDetails.details = ''
-    },
-    showPaymentCompentedCard(details = '') {
-      this.currentView = 'paymentStatus'
-      this.paymentDetails.isPayed = true
-      this.paymentDetails.message = 'Success!'
-      this.paymentDetails.details = details
-    },
   },
   mounted: async function () {
     this.showDialog = true
@@ -272,11 +228,10 @@ export default {
         this.activeWallet = await configSvc.getActiveWallet()
         this.decodeRequest()
       } else {
-        this.$q.notify({
-          type: 'negative',
-          message: 'No user or wallet found!',
-          caption: `Please check that you are connected to a LNbits server.`,
-        })
+        this.showErrorCard(
+          'No user or wallet found!',
+          'Please check that you are connected to a LNbits server.'
+        )
       }
     } catch (err) {
       console.error(err)

diff --git a/src/views/content-inject/content.js b/src/views/content-inject/content.js
@@ -8,6 +8,7 @@ import InvoiceDetails from '../../components/InvoiceDetails.vue'
 import PaymentStatus from '../../components/PaymentStatus.vue'
 import LnurlPay from '../../components/LnurlPay.vue'
 import LnurlWithdraw from '../../components/LnurlWithdraw.vue'
+import LnurlAuth from '../../components/LnurlAuth.vue'
 import ErrorCard from '../../components/ErrorCard.vue'
 
 import routes from './routes'
@@ -24,6 +25,7 @@ try {
   Vue.component('payment-status', PaymentStatus)
   Vue.component('lnurl-pay', LnurlPay)
   Vue.component('lnurl-withdraw', LnurlWithdraw)
+  Vue.component('lnurl-auth', LnurlAuth)
   Vue.component('error-card', ErrorCard)