From 76eafb8fa5c2dbad6e88ff54e0411533e4f0f2f6 Mon Sep 17 00:00:00 2001
From: silverpill <silverpill@firemail.cc>
Date: Fri, 10 Jun 2022 16:12:46 +0000
Subject: [PATCH] Show loader on subscription page

---
 src/components/Subscription.vue | 49 +++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/components/Subscription.vue b/src/components/Subscription.vue
index 0aa203b..cb4eb6b 100644
--- a/src/components/Subscription.vue
+++ b/src/components/Subscription.vue
@@ -64,6 +64,7 @@
         </button>
       </div>
     </form>
+    <loader v-if="isLoading"></loader>
   </div>
 </template>
 
@@ -81,6 +82,7 @@ import {
   SubscriptionState,
 } from "@/api/subscriptions"
 import Avatar from "@/components/Avatar.vue"
+import Loader from "@/components/Loader.vue"
 import { useWallet } from "@/composables/wallet"
 import { useInstanceInfo } from "@/store/instance"
 import { useCurrentUser } from "@/store/user"
@@ -115,6 +117,7 @@ const recipientEthereumAddress = recipient.getVerifiedEthereumAddress()
 const sender = $ref<ProfileWrapper>(new ProfileWrapper(currentUser || guest))
 let senderEthereumAddress = $ref<string | null>(sender.getVerifiedEthereumAddress())
 let { walletAddress, walletError } = $(useWallet())
+let isLoading = $ref(false)
 let subscriptionConfigured = $ref<boolean | null>(null)
 let subscription = $ref<Subscription | null>(null)
 let subscriptionState = $ref<SubscriptionState | null>(null)
@@ -166,6 +169,7 @@ async function checkSubscription() {
   }
   senderEthereumAddress = walletAddress.toLowerCase()
   const signer = getWeb3Provider().getSigner()
+  isLoading = true
   subscription = await getSubscriptionInfo(
     instance.blockchain_contract_address,
     signer,
@@ -182,6 +186,7 @@ async function checkSubscription() {
     walletAddress,
     recipientEthereumAddress,
   )
+  isLoading = false
 }
 
 function getPaymentAmount(): number {
@@ -206,12 +211,20 @@ async function onMakeSubscriptionPayment() {
   }
   const signer = getWeb3Provider().getSigner()
   const amount = subscription.pricePerMonthInt.mul(paymentDuration)
-  const transaction = await makeSubscriptionPayment(
-    instance.blockchain_contract_address,
-    signer,
-    recipientEthereumAddress,
-    amount,
-  )
+  isLoading = true
+  let transaction
+  try {
+    transaction = await makeSubscriptionPayment(
+      instance.blockchain_contract_address,
+      signer,
+      recipientEthereumAddress,
+      amount,
+    )
+  } catch (error) {
+    console.error(error)
+    isLoading = false
+    return
+  }
   await transaction.wait()
   subscriptionState = await getSubscriptionState(
     instance.blockchain_contract_address,
@@ -219,6 +232,7 @@ async function onMakeSubscriptionPayment() {
     walletAddress,
     recipientEthereumAddress,
   )
+  isLoading = false
 }
 
 function canCancel(): boolean {
@@ -237,11 +251,19 @@ async function onCancelSubscription() {
     return
   }
   const signer = getWeb3Provider().getSigner()
-  const transaction = await cancelSubscription(
-    instance.blockchain_contract_address,
-    signer,
-    recipientEthereumAddress,
-  )
+  isLoading = true
+  let transaction
+  try {
+    transaction = await cancelSubscription(
+      instance.blockchain_contract_address,
+      signer,
+      recipientEthereumAddress,
+    )
+  } catch (error) {
+    console.error(error)
+    isLoading = false
+    return
+  }
   await transaction.wait()
   subscriptionState = await getSubscriptionState(
     instance.blockchain_contract_address,
@@ -249,6 +271,7 @@ async function onCancelSubscription() {
     walletAddress,
     recipientEthereumAddress,
   )
+  isLoading = false
 }
 </script>
 
@@ -307,6 +330,10 @@ async function onCancelSubscription() {
   }
 }
 
+.loader {
+  margin: 0 auto;
+}
+
 .info {
   background-color: $block-background-color;
   border-radius: $block-border-radius;