From c0f388f46eddb1120476472dd03e51e1b48fa81a Mon Sep 17 00:00:00 2001
From: RcleydsonR <rafael.cleydson@gmail.com>
Date: Thu, 16 Feb 2023 19:53:26 -0300
Subject: [PATCH] Add loading for listing component and add validation to show
 withdraw box only when a wallet has atleast one deposit

---
 src/blockchain/events.ts                      |  3 --
 .../ListingComponent/ListingComponent.vue     | 31 +++++++++--
 .../__tests__/ListingComponent.spec.ts        | 12 +++--
 src/model/mock/WalletTransactionMock.ts       | 54 +++++++++++++++++++
 src/store/ether.ts                            |  4 ++
 src/views/ManageBidsView.vue                  | 42 ++++-----------
 6 files changed, 102 insertions(+), 44 deletions(-)
 create mode 100644 src/model/mock/WalletTransactionMock.ts

diff --git a/src/blockchain/events.ts b/src/blockchain/events.ts
index 59608f6..64c896b 100644
--- a/src/blockchain/events.ts
+++ b/src/blockchain/events.ts
@@ -10,7 +10,6 @@ import { NetworkEnum } from "@/model/NetworkEnum";
 
 const getNetworksLiquidity = async (): Promise<void> => {
   const etherStore = useEtherStore();
-  console.log("Loading events");
 
   const goerliProvider = new ethers.providers.JsonRpcProvider(
     import.meta.env.VITE_GOERLI_API_URL,
@@ -43,10 +42,8 @@ const getNetworksLiquidity = async (): Promise<void> => {
   );
 
   etherStore.setDepositsValidListGoerli(depositListGoerli);
-  console.log(depositListGoerli);
 
   etherStore.setDepositsValidListMumbai(depositListMumbai);
-  console.log(depositListMumbai);
 };
 
 const getValidDeposits = async (
diff --git a/src/components/ListingComponent/ListingComponent.vue b/src/components/ListingComponent/ListingComponent.vue
index ce28390..afa4a4b 100644
--- a/src/components/ListingComponent/ListingComponent.vue
+++ b/src/components/ListingComponent/ListingComponent.vue
@@ -4,8 +4,11 @@ import { NetworkEnum } from "@/model/NetworkEnum";
 import type { ValidDeposit } from "@/model/ValidDeposit";
 import type { WalletTransaction } from "@/model/WalletTransaction";
 import { useEtherStore } from "@/store/ether";
+import { storeToRefs } from "pinia";
 import { ref, watch } from "vue";
 
+const etherStore = useEtherStore();
+
 // props
 const props = defineProps<{
   validDeposits: ValidDeposit[];
@@ -14,8 +17,7 @@ const props = defineProps<{
 
 const emit = defineEmits(["depositWithdrawn"]);
 
-const etherStore = useEtherStore();
-
+const { loadingWalletTransactions } = storeToRefs(etherStore);
 const itemsToShow = ref<WalletTransaction[]>([]);
 const withdrawAmount = ref<string>("");
 const withdrawButtonOpacity = ref<number>(0.6);
@@ -108,8 +110,29 @@ showInitialItems();
 </script>
 
 <template>
-  <div class="blur-container">
-    <div class="w-full bg-white p-6 rounded-lg">
+  <div class="blur-container" v-if="loadingWalletTransactions">
+    <svg
+      aria-hidden="true"
+      class="w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-white"
+      viewBox="0 0 100 101"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+        fill="currentColor"
+      />
+      <path
+        d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+        fill="currentFill"
+      />
+    </svg>
+  </div>
+  <div class="blur-container" v-if="!loadingWalletTransactions">
+    <div
+      class="w-full bg-white p-6 rounded-lg"
+      v-if="props.validDeposits.length > 0"
+    >
       <div class="flex justify-between items-center">
         <div>
           <p class="text-sm leading-5 font-medium text-gray-600">
diff --git a/src/components/ListingComponent/__tests__/ListingComponent.spec.ts b/src/components/ListingComponent/__tests__/ListingComponent.spec.ts
index 9d066db..114530e 100644
--- a/src/components/ListingComponent/__tests__/ListingComponent.spec.ts
+++ b/src/components/ListingComponent/__tests__/ListingComponent.spec.ts
@@ -3,11 +3,13 @@ import ListingComponent from "@/components/ListingComponent/ListingComponent.vue
 import { createPinia, setActivePinia } from "pinia";
 import { expect } from "vitest";
 import { MockValidDeposits } from "@/model/mock/ValidDepositMock";
-import { MockEvents } from "@/model/mock/EventMock";
+import { MockWalletTransactions } from "@/model/mock/WalletTransactionMock";
+import { useEtherStore } from "@/store/ether";
 
 describe("ListingComponent.vue", () => {
   beforeEach(() => {
     setActivePinia(createPinia());
+    useEtherStore().setLoadingWalletTransactions(false);
   });
 
   test("Test Message when an empty array is received", () => {
@@ -25,7 +27,7 @@ describe("ListingComponent.vue", () => {
     const wrapper = mount(ListingComponent, {
       props: {
         validDeposits: [],
-        walletTransactions: MockEvents,
+        walletTransactions: MockWalletTransactions,
       },
     });
 
@@ -38,7 +40,7 @@ describe("ListingComponent.vue", () => {
     const wrapper = mount(ListingComponent, {
       props: {
         validDeposits: MockValidDeposits,
-        walletTransactions: MockEvents,
+        walletTransactions: MockWalletTransactions,
       },
     });
     const btn = wrapper.find("button");
@@ -50,14 +52,14 @@ describe("ListingComponent.vue", () => {
 
     elements = wrapper.findAll(".item-container");
 
-    expect(elements).toHaveLength(4);
+    expect(elements).toHaveLength(5);
   });
 
   test("Test withdraw offer button emit", async () => {
     const wrapper = mount(ListingComponent, {
       props: {
         validDeposits: MockValidDeposits,
-        walletTransactions: MockEvents,
+        walletTransactions: MockWalletTransactions,
       },
     });
     wrapper.vm.$emit("depositWithdrawn");
diff --git a/src/model/mock/WalletTransactionMock.ts b/src/model/mock/WalletTransactionMock.ts
new file mode 100644
index 0000000..3cab827
--- /dev/null
+++ b/src/model/mock/WalletTransactionMock.ts
@@ -0,0 +1,54 @@
+import type { WalletTransaction } from "../WalletTransaction";
+
+export const MockWalletTransactions: WalletTransaction[] = [
+  {
+    blockNumber: 1,
+    token: "1",
+    amount: 70,
+    seller: "mockedSellerAddress",
+    buyer: "mockedBuyerAddress",
+    event: "Deposit",
+    lockStatus: 0,
+    transactionHash: "1",
+  },
+  {
+    blockNumber: 2,
+    token: "2",
+    amount: 200,
+    seller: "mockedSellerAddress",
+    buyer: "mockedBuyerAddress",
+    event: "Lock",
+    lockStatus: 1,
+    transactionHash: "2",
+  },
+  {
+    blockNumber: 3,
+    token: "3",
+    amount: 1250,
+    seller: "mockedSellerAddress",
+    buyer: "mockedBuyerAddress",
+    event: "Release",
+    lockStatus: 2,
+    transactionHash: "3",
+  },
+  {
+    blockNumber: 4,
+    token: "4",
+    amount: 4000,
+    seller: "mockedSellerAddress",
+    buyer: "mockedBuyerAddress",
+    event: "Deposit",
+    lockStatus: 0,
+    transactionHash: "4",
+  },
+  {
+    blockNumber: 5,
+    token: "5",
+    amount: 2000,
+    seller: "mockedSellerAddress",
+    buyer: "mockedBuyerAddress",
+    event: "Deposit",
+    lockStatus: 3,
+    transactionHash: "5",
+  },
+];
diff --git a/src/store/ether.ts b/src/store/ether.ts
index 9de0037..ba3778b 100644
--- a/src/store/ether.ts
+++ b/src/store/ether.ts
@@ -13,6 +13,7 @@ export const useEtherStore = defineStore("ether", {
     depositsValidListGoerli: [] as ValidDeposit[],
     // Depósitos válidos para compra MUMBAI
     depositsValidListMumbai: [] as ValidDeposit[],
+    loadingWalletTransactions: false,
   }),
   actions: {
     setWalletAddress(walletAddress: string) {
@@ -36,6 +37,9 @@ export const useEtherStore = defineStore("ether", {
     setDepositsValidListMumbai(depositsValidList: ValidDeposit[]) {
       this.depositsValidListMumbai = depositsValidList;
     },
+    setLoadingWalletTransactions(isLoadingWalletTransactions: boolean) {
+      this.loadingWalletTransactions = isLoadingWalletTransactions;
+    },
   },
   // Alterar para integrar com mumbai
   getters: {
diff --git a/src/views/ManageBidsView.vue b/src/views/ManageBidsView.vue
index 3620deb..cec6c62 100644
--- a/src/views/ManageBidsView.vue
+++ b/src/views/ManageBidsView.vue
@@ -47,7 +47,8 @@ const updateRemaining = async () => {
   transactionsList.value = allUserTransactions;
 };
 
-onMounted(async () => {
+const getWalletTransactions = async () => {
+  etherStore.setLoadingWalletTransactions(true);
   if (walletAddress.value) {
     const walletDeposits = await listValidDepositTransactionsByWalletAddress(
       walletAddress.value
@@ -64,42 +65,19 @@ onMounted(async () => {
       transactionsList.value = allUserTransactions;
     }
   }
+  etherStore.setLoadingWalletTransactions(false);
+};
+
+onMounted(async () => {
+  await getWalletTransactions();
 });
 
-watch(walletAddress, async (newValue) => {
-  await listValidDepositTransactionsByWalletAddress(newValue)
-    .then((res) => {
-      if (res) depositList.value = res;
-    })
-    .catch(() => {
-      depositList.value = [];
-    });
-
-  await listAllTransactionByWalletAddress(newValue)
-    .then((res) => {
-      if (res) transactionsList.value = res;
-    })
-    .catch(() => {
-      transactionsList.value = [];
-    });
+watch(walletAddress, async () => {
+  await getWalletTransactions();
 });
 
 watch(networkName, async () => {
-  await listValidDepositTransactionsByWalletAddress(walletAddress.value)
-    .then((res) => {
-      if (res) depositList.value = res;
-    })
-    .catch(() => {
-      depositList.value = [];
-    });
-
-  await listAllTransactionByWalletAddress(walletAddress.value)
-    .then((res) => {
-      if (res) transactionsList.value = res;
-    })
-    .catch(() => {
-      transactionsList.value = [];
-    });
+  await getWalletTransactions();
 });
 </script>