From d7723ebf074c3e3ac410ba2c99955da85a7a3b5e Mon Sep 17 00:00:00 2001 From: RcleydsonR Date: Thu, 19 Jan 2023 19:42:57 -0300 Subject: [PATCH] Clean up ether store Co-authored-by: brunoedcf --- src/blockchain/events.ts | 35 +++++++++---------- .../SellerSteps/SellerSearchComponent.vue | 2 +- .../SellerSteps/WantSellComponent.vue | 5 ++- src/components/TopBar.vue | 7 +--- src/store/ether.ts | 34 ------------------ src/views/ManageBidsView.vue | 23 ++++++------ src/views/TransactionHistoryView.vue | 10 +++--- 7 files changed, 41 insertions(+), 75 deletions(-) diff --git a/src/blockchain/events.ts b/src/blockchain/events.ts index 715ecf3..2f18f5d 100644 --- a/src/blockchain/events.ts +++ b/src/blockchain/events.ts @@ -60,26 +60,25 @@ const getValidDeposits = async ( const eventsDeposits = await p2pContract.queryFilter(filterDeposits); const depositList = await Promise.all( - eventsDeposits - .map(async (deposit) => { - const mappedDeposit = await p2pContract.mapDeposits( - deposit.args?.depositID - ); - let validDeposit: ValidDeposit | null = null; + eventsDeposits.map(async (deposit) => { + const mappedDeposit = await p2pContract.mapDeposits( + deposit.args?.depositID + ); + let validDeposit: ValidDeposit | null = null; - if (mappedDeposit.valid) { - validDeposit = { - blockNumber: deposit.blockNumber, - depositID: deposit.args?.depositID, - remaining: Number(formatEther(mappedDeposit.remaining)), - seller: mappedDeposit.seller, - pixKey: mappedDeposit.pixTarget, - }; - } + if (mappedDeposit.valid) { + validDeposit = { + blockNumber: deposit.blockNumber, + depositID: deposit.args?.depositID, + remaining: Number(formatEther(mappedDeposit.remaining)), + seller: mappedDeposit.seller, + pixKey: mappedDeposit.pixTarget, + }; + } - return validDeposit; - }) - ); + return validDeposit; + }) + ); return depositList.filter((deposit) => deposit) as ValidDeposit[]; }; diff --git a/src/components/SellerSteps/SellerSearchComponent.vue b/src/components/SellerSteps/SellerSearchComponent.vue index 99faabc..86ed7ee 100644 --- a/src/components/SellerSteps/SellerSearchComponent.vue +++ b/src/components/SellerSteps/SellerSearchComponent.vue @@ -19,7 +19,7 @@ const handleInputEvent = (event: any): void => { tokenValue.value = Number(value); - if (decimalCount(tokenValue.value) > 2) { + if (decimalCount(String(tokenValue.value)) > 2) { validDecimals.value = false; enableSelectButton.value = false; return; diff --git a/src/components/SellerSteps/WantSellComponent.vue b/src/components/SellerSteps/WantSellComponent.vue index b09893f..b82e839 100644 --- a/src/components/SellerSteps/WantSellComponent.vue +++ b/src/components/SellerSteps/WantSellComponent.vue @@ -35,7 +35,10 @@ const handleInputEvent = (event: any): void => { validDecimals.value = true; }; -const handleButtonClick = async (offer: string, pixKey: string): Promise => { +const handleButtonClick = async ( + offer: string, + pixKey: string +): Promise => { if (walletAddress.value) emit("approveTokens", { offer, pixKey }); else await connectProvider(); }; diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue index 6f31053..936dee8 100644 --- a/src/components/TopBar.vue +++ b/src/components/TopBar.vue @@ -10,7 +10,7 @@ import polygonImage from "../assets/polygon.svg"; // Store reference const etherStore = useEtherStore(); -const { walletAddress, balance, sellerView } = storeToRefs(etherStore); +const { walletAddress, sellerView } = storeToRefs(etherStore); const menuOpenToggle = ref(false); const menuHoverToggle = ref(false); @@ -33,11 +33,6 @@ const formatWalletAddress = (): string => { return `${initialText}...${finalText}`; }; -const formatWalletBalance = (): string => { - const fixed = Number(balance.value); - return fixed.toFixed(2); -}; - const disconnectUser = (): void => { etherStore.setWalletAddress(""); closeMenu(); diff --git a/src/store/ether.ts b/src/store/ether.ts index 7eb63c5..9de0037 100644 --- a/src/store/ether.ts +++ b/src/store/ether.ts @@ -1,6 +1,5 @@ import { NetworkEnum } from "@/model/NetworkEnum"; import type { ValidDeposit } from "@/model/ValidDeposit"; -import type { Event } from "ethers"; import { defineStore } from "pinia"; export const useEtherStore = defineStore("ether", { @@ -9,23 +8,11 @@ export const useEtherStore = defineStore("ether", { balance: "", networkName: NetworkEnum.ethereum, loadingLock: false, - loadingWalletTransactionHistory: false, - loadingWalletBids: false, sellerView: false, // Depósitos válidos para compra GOERLI depositsValidListGoerli: [] as ValidDeposit[], // Depósitos válidos para compra MUMBAI depositsValidListMumbai: [] as ValidDeposit[], - // Depósitos adicionados na blockchain - depositsAddedList: [] as Event[], - // Depósitos expirados na blockchain - depositsExpiredList: [] as Event[], - // Locks adicionados na blockchain - locksAddedList: [] as Event[], - // Locks 'released' na blockchain - locksReleasedList: [] as Event[], - // Locks expirados na blockchain - locksExpiredList: [] as Event[], }), actions: { setWalletAddress(walletAddress: string) { @@ -43,33 +30,12 @@ export const useEtherStore = defineStore("ether", { setSellerView(sellerView: boolean) { this.sellerView = sellerView; }, - setLoadingWalletTransactionHistory(loadingWalletTransactionHistory: boolean) { - this.loadingWalletTransactionHistory = loadingWalletTransactionHistory; - }, - setLoadingWalletBids(loadingWalletBids: boolean) { - this.loadingWalletBids = loadingWalletBids; - }, setDepositsValidListGoerli(depositsValidList: ValidDeposit[]) { this.depositsValidListGoerli = depositsValidList; }, setDepositsValidListMumbai(depositsValidList: ValidDeposit[]) { this.depositsValidListMumbai = depositsValidList; }, - setDepositsAddedList(depositsAddedList: Event[]) { - this.depositsAddedList = depositsAddedList; - }, - setDepositsExpiredList(depositsExpiredList: Event[]) { - this.depositsExpiredList = depositsExpiredList; - }, - setLocksAddedList(locksAddedList: Event[]) { - this.locksAddedList = locksAddedList; - }, - setLocksReleasedList(locksReleasedList: Event[]) { - this.locksReleasedList = locksReleasedList; - }, - setLocksExpiredList(locksExpiredList: Event[]) { - this.locksExpiredList = locksExpiredList; - }, }, // Alterar para integrar com mumbai getters: { diff --git a/src/views/ManageBidsView.vue b/src/views/ManageBidsView.vue index 152076d..418227f 100644 --- a/src/views/ManageBidsView.vue +++ b/src/views/ManageBidsView.vue @@ -10,18 +10,19 @@ import type { ValidDeposit } from "@/model/ValidDeposit"; const etherStore = useEtherStore(); -const { walletAddress, networkName, loadingWalletBids } = storeToRefs(etherStore); +const { walletAddress, networkName } = storeToRefs(etherStore); const depositList = ref([]); onMounted(async () => { if (walletAddress.value) { - const walletDeposits = await listValidDepositTransactionsByWalletAddress( - walletAddress.value - ); - if (walletDeposits) { - depositList.value = walletDeposits; + const walletDeposits = await listValidDepositTransactionsByWalletAddress( + walletAddress.value + ); + if (walletDeposits) { + depositList.value = walletDeposits; + } } -}}) +}); const handleCancelDeposit = async (depositID: BigNumber, index: number) => { const response = await cancelDeposit(depositID); @@ -49,9 +50,11 @@ watch(walletAddress, async () => { }); watch(networkName, async () => { - await listValidDepositTransactionsByWalletAddress(walletAddress.value).then((res) => { - if (res) depositList.value = res; - }); + await listValidDepositTransactionsByWalletAddress(walletAddress.value).then( + (res) => { + if (res) depositList.value = res; + } + ); }); diff --git a/src/views/TransactionHistoryView.vue b/src/views/TransactionHistoryView.vue index e7ec315..06f03ea 100644 --- a/src/views/TransactionHistoryView.vue +++ b/src/views/TransactionHistoryView.vue @@ -13,11 +13,11 @@ const allUserTransactions = ref<(Event | ValidDeposit)[]>([]); onMounted(async () => { if (walletAddress.value) { - await listAllTransactionByWalletAddress(walletAddress.value).then((res) => { - if (res) allUserTransactions.value = res; - }); -} -}) + await listAllTransactionByWalletAddress(walletAddress.value).then((res) => { + if (res) allUserTransactions.value = res; + }); + } +}); watch(walletAddress, async (newValue) => { await listAllTransactionByWalletAddress(newValue).then((res) => {