From cf9760bb2168b644a1dd36f6f3140f698c3909ec Mon Sep 17 00:00:00 2001
From: brunoedcf <brest.dallacosta@outlook.com>
Date: Mon, 13 Feb 2023 19:15:01 -0300
Subject: [PATCH] Pull Request review changes

---
 .../ListingComponent/ListingComponent.vue     | 48 ++++---------------
 src/views/ManageBidsView.vue                  |  5 +-
 2 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/src/components/ListingComponent/ListingComponent.vue b/src/components/ListingComponent/ListingComponent.vue
index 1fc9059..880cc2f 100644
--- a/src/components/ListingComponent/ListingComponent.vue
+++ b/src/components/ListingComponent/ListingComponent.vue
@@ -9,16 +9,15 @@ import { ref, watch } from "vue";
 
 // props
 const props = defineProps<{
-  depositList: (Event | ValidDeposit)[];
-  walletTransactions: (Event | ValidDeposit)[];
-  isManageMode: boolean;
+  depositList: ValidDeposit[];
+  walletTransactions: Event[];
 }>();
 
 const emit = defineEmits(["depositWithdrawn"]);
 
 const etherStore = useEtherStore();
 
-const itemsToShow = ref<(Event | ValidDeposit)[]>([]);
+const itemsToShow = ref<Event[]>([]);
 const withdrawAmount = ref<string>("");
 
 const callWithdraw = async () => {
@@ -34,7 +33,7 @@ const callWithdraw = async () => {
 
 const getRemaining = (): number => {
   if (props.depositList instanceof Array) {
-    const deposit = props.depositList[0] as ValidDeposit;
+    const deposit = props.depositList[0];
     return deposit ? deposit.remaining : 0;
   }
   return 0;
@@ -46,13 +45,6 @@ const getExplorer = (): string => {
     : "Polygonscan";
 };
 
-// Methods
-const isValidDeposit = (
-  deposit: Event | ValidDeposit
-): deposit is ValidDeposit => {
-  return (deposit as ValidDeposit).token !== undefined;
-};
-
 const showInitialItems = (): void => {
   itemsToShow.value = props.walletTransactions.slice(0, 3);
 };
@@ -120,7 +112,7 @@ showInitialItems();
           <p class="text-xs leading-4 font-medium text-gray-600"></p>
         </div>
       </div>
-      <div class="pt-5" v-if="props.isManageMode">
+      <div class="pt-5">
         <div class="py-2">
           <p class="text-sm leading-5 font-medium">Valor do saque</p>
           <input
@@ -153,14 +145,10 @@ showInitialItems();
       <div class="item-container">
         <div>
           <p class="text-sm leading-5 font-medium text-gray-600">
-            {{ getEventName((item as Event).event) }}
+            {{ getEventName(item.event) }}
           </p>
           <p class="text-xl leading-7 font-semibold text-gray-900">
-            {{
-              isValidDeposit(item)
-                ? item.remaining
-                : getAmountFormatted(item.args?.amount)
-            }}
+            {{ getAmountFormatted(item.args?.amount) }}
             BRZ
           </p>
           <p class="text-xs leading-4 font-medium text-gray-600"></p>
@@ -170,34 +158,14 @@ showInitialItems();
             Finalizado
           </div>
           <div
-            v-if="props.isManageMode"
             class="flex gap-2 cursor-pointer items-center justify-self-center"
-            @click="openEtherscanUrl((item as Event)?.transactionHash)"
+            @click="openEtherscanUrl(item?.transactionHash)"
           >
             <span class="last-release-info">{{ getExplorer() }}</span>
             <img alt="Redirect image" src="@/assets/redirect.svg" />
           </div>
         </div>
       </div>
-      <!-- <div class="pt-5" v-if="props.isManageMode">
-        <div class="py-2">
-          <p class="text-sm leading-5 font-medium">Valor do saque</p>
-          <p class="text-2xl leading-8 font-medium">0</p>
-        </div>
-
-        <hr class="pb-3" />
-        <div class="flex justify-between items-center">
-          <div
-            class="flex gap-2 cursor-pointer items-center justify-self-center border-2 p-2 border-amber-300 rounded-md"
-            @click="
-              emit('withdrawDeposit', (item as ValidDeposit).token, index)
-            "
-          >
-            <img alt="Withdraw image" src="@/assets/withdraw.svg" />
-            <span class="last-release-info">Sacar</span>
-          </div>
-        </div>
-      </div> -->
     </div>
     <div
       class="flex flex-col justify-center items-center w-full mt-2 gap-2"
diff --git a/src/views/ManageBidsView.vue b/src/views/ManageBidsView.vue
index 8ae7cd9..3373168 100644
--- a/src/views/ManageBidsView.vue
+++ b/src/views/ManageBidsView.vue
@@ -14,7 +14,7 @@ const etherStore = useEtherStore();
 
 const { walletAddress, networkName } = storeToRefs(etherStore);
 const depositList = ref<ValidDeposit[]>([]);
-const transactionsList = ref<(Event | ValidDeposit)[]>([]);
+const transactionsList = ref<Event[]>([]);
 
 const updateRemaining = async () => {
   const walletDeposits = await listValidDepositTransactionsByWalletAddress(
@@ -33,12 +33,10 @@ onMounted(async () => {
     const walletDeposits = await listValidDepositTransactionsByWalletAddress(
       walletAddress.value
     );
-    console.log(walletDeposits);
 
     const allUserTransactions = await listAllTransactionByWalletAddress(
       walletAddress.value
     );
-    console.log(allUserTransactions);
 
     if (walletDeposits) {
       depositList.value = walletDeposits;
@@ -93,7 +91,6 @@ watch(networkName, async () => {
       <ListingComponent
         :deposit-list="depositList"
         :wallet-transactions="transactionsList"
-        :is-manage-mode="true"
         @deposit-withdrawn="updateRemaining"
       ></ListingComponent>
     </div>